reconciled work branch
fix
Merge branch 'master' into necromancer
Improved install script to make backups