Removing auto keyswap from bashrc.
Updating vim snippets.
Merge branch 'master' of github.com:jmatth/dotfiles
Setting vi keybindings in zshrc