Move custom sync to collection
Cleanup (whitespace, useless file)
Merge branch 'master' into gh-pages