Updated setup script.  Updated vimrc