corresponding evisceration and repair of other stuff
Merge branch 'master' of https://github.com/rcoffey/hubway