For updater: Assorted cleanups and fixes
Merge pull request #59 from rowanthorpe/improve-update-script

For updater: Assorted cleanups and fixes