Fix so that a 2nd install attempt on the same VM will succeed
merged with testing
fix to ensure that leftover files are cleaned up before reinstall
Merge pull request #493 from briandrawert/fix-install-so-2nd-install-attempt-works

Fix so that a 2nd install attempt on the same VM will succeed