Update a few changes to .vimrc and .osx