Update git email
Update vimrc
Merge branch 'master' into osx