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

Conflicts:
	bash/.bashrc
	vim/.vim/bundle/calendar.vim
	vim/.vim/bundle/jedi-vim
	vim/.vim/bundle/lightline.vim
	vim/.vim/bundle/nerdtree
	vim/.vim/bundle/syntastic
	vim/.vim/bundle/vim-fugitive

bash/.bashrc

@@ -6,13 +6,27 @@ if [ -f /etc/bashrc ]; then
 fi
 
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
+#export SYSTEMD_PAGER=
+
+#pager setup
+#-C faster reprints
+#-M more status
+#-I case insensitive
+#-j 5 show X lines above search for context
+## 4 - right/left four chars
+export LESS='-C -M -I -j 5 -# 4'
 
 # User specific aliases and functions
 alias l.='ls -lh --color=auto' 2>/dev/null
-alias l='ls -lh'
-alias ll='ls -lh'
-#set -o vi
+alias l='ls -lh --color=auto'
+alias ll='ls -lh --color=auto'
+alias p='ping'
+alias s='sudo'
+<<<<<<< HEAD
+alias dmesg='dmesg -H'
+=======
+alias ip='ip -c'
+>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -21,4 +35,13 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+<<<<<<< HEAD
 alias p='ping'
+=======
+
+#ctrl-x, ctrl-e to launch $EDITOR (vim)
+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
+>>>>>>> 8f3230921e0db7fc1f6198ef62604af9b1e6b833