Moved vim setup out of install.sh.  Cleanups