Update to BaseLocations

In rolling out to B and Q, we found some additional locations where buses are parked/maintained. This update includes those new spaces. It also updates the BaseLocations in the integration tests-- which can be rolled back if necessary. 

Not an incredible priority to merge in, so please include in the most convenient release.