More fixes to script. Added vim stuff.