some changes would be overwritten by syncing :(
Merge branch 'master' of https://github.com/rcoffey/hubway