Update vimrc for vim 7.4a1 beta
First commit in osx branch for Mac OS X specific settings
Merge branch 'osx' of https://github.com/Happy-Dude/dotfiles into osx