Changes to Zsh, OS X script and vimrc