Hopefully fixed ParcelablePair crashes by just making them Serializable
instead. Switch maps keys.
Updated bus routes and stops to reflect recent UT Shuttle changes