Do not remove trailing whitespace -- put into function
Update submodules
First commit in osx branch for Mac OS X specific settings
solarized osx setting