Merge 2.0 in to master branch

Also @caitbonnar be sure to see the updated [releasing process](https://github.com/OneBusAway/onebusaway-iphone#releasing).