Use vehicles.csv input in UrbanSim scenarios

[zneedell]

Previously the scenario's PrivateVehicles attribute was being overwritten during scenarioAdjustment when we're using an urbansim scenario (as is the case during pilates). Here's a trial fix, with a hack to hopefully not break anything when freight is turned on

---

This change is