merging in changes from mac .vimrc

Super awesome vimrc now
Merge branch 'master' of github.com:mrinterweb/dot-files
fixing typo in vimrc