Remove order or cleanup (workaround for #58)
Merge branch 'develop' of github.com:syncany/syncany into develop