Less resyncing
Merge branch 'master' of https://github.com/holycattle/strawberryjam