Update CHANGELOG.md
Merge pull request #125 from OneBusAway/develop

Develop
update changelog
merge roadmap changes
Merge remote-tracking branch 'upstream/master' into changelog
reorder  changelog