Remove hammer from vimrc.
Merge branch 'master' of github.com:adamvaughan/dotfiles
Merge branch 'master' of github.com:adamvaughan/dotfiles
Update vim plugins.
Change vim color scheme.