Update .vimrc
user email chg
Merge branch 'osx-work' of github.com:shawndumas/dotfiles into osx-work