Fix work vim annoyances
Merge branch 'master' of github.com:mmcclimon/dotfiles