Changing timings in test such that they are not (less?) filesystem dependent
Merge branch 'vanishedfiletiming' of https://github.com/pimotte/syncany
Merge branch 'master' into gui