Fixed setup.sh and corresponding vimrc issues