Different id's since FileHistories of files of different types should never have the same id
Removing TODO
removeDatabaseVersion test
If the transfer fails, we remove the local directories.
Merge branch 'init-safety' of github.com:pimotte/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
Merge branch 'master' into gui