sync at least every hour, even if not idle
Merge branch 'master' of github.com:XANi/config