Update for Discrete Choice Models

synthicity/urbansim#134 changes location choices models to discrete choice models with some more general capabilities. This updates the demo LCMs to use the discrete choice classes.

Also fixed a little more stuff related to cacheing I should have done in #7.