merging in changes from mac .vimrc

Super awesome vimrc now