Added vim to install script
Merged upstream
Renamed plugins and updated default vim defaults.