Initial commit from Launchpad branch 147
Merge https://github.com/binwiederhier/syncany