Ignoring some other stuff I'm doing on this server
Merge branch 'master' of github.com:thethp/hubwaypi