Use GTFS shapes now that they're available
Merge branch 'master' into mbta