Code prettification
Merge branch 'develop' of github.com:binwiederhier/syncany into develop