Vim improvements
Merge branch 'master' of github.com:jpotterm/dotfiles