ps1 and gvim fixups
Improved install script to make backups
added necromancer to merge script
Merge branch 'master' into necromancer