Update vimrc with mapping Q to NOP
Update submodules
First commit in osx branch for Mac OS X specific settings
solarized osx setting