Add hidden to vimrc
Merge branch 'master' into osx
Merge branch 'osx' into rover