Big vimrc cleanup
Merge branch 'master' of github.com:/dominichamon/dotfiles