merged changes from linux branch to osx vimrc file