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

bash/.bashrc

@@ -32,5 +32,11 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-xrdb -merge /home/jon/.colors/codeschool.dark
 
+#vi readline
+set -o vi
+#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