Fix and simplify upgrade.py
Exit the waiting loop even if the upgrader failed, assert if it did.
Merge pull request #4 from whirm/tftp_plusmetadata_removeswift

Fix and simplify upgrade.py