Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/jpvelez/transit-future into gh-pages