formatting adjustments
Fixing tests after rename
Merge branch 'feature/atomic-operations' of https://github.com/syncany/syncany into feature/atomic-operations