merged vimrc at work with laptop on OSX