Changed the vimrc so that it ostensibly works with OS X.
Merge branch 'master' of http://github.com/techstep/vimrc