Cleaned up vimrc a bit, and hopefully fixed zshrc for OS X