More vimrc cleanup
Merge branch 'master' of github.com:vinniefranco/dotfiles