update email in gitconfig, update vimrc to properly do CamelCaseMotion on macosx
Merge remote-tracking branch 'origin/master'