OS X

Merge changes from updating for OS X. Fixes vimrc to match new vundle syntax.