Merge pull request #4 from whirm/tftp_plusmetadata_removeswift

Fix and simplify upgrade.py
Fix migration (typo)
Merge pull request #5 from whirm/tftp_plusmetadata_removeswift

Fix migration (typo)
add timeout callback for libtorrent metainfo retrieval
simplify RemoteTorrentHandler
fix all unit tests