Merge branch 'master' of ssh://jonfu.com/home/jon/dots

bash/.bashrc

@@ -13,6 +13,8 @@ alias l.='ls -lh --color=auto' 2>/dev/null
 alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
+alias p='ping'
+alias s='sudo'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -22,6 +24,7 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
+<<<<<<< HEAD
 #vi readline
 set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
@@ -29,3 +32,5 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
+=======
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf