watts solar water heater .dat reader
admin.py added water
.dat parser version 2. all new and shiny!
solar water scraper optomizations.
more little things
optomizations!!!
electric schema migrations (TODO: scraper update)
updated name ChannelEntry=>CircuitEntry; updated electric scraper
added test code to electric/scrapers
updated urls and views since ChannelNameMap is gone
hvac scraper/model cleanup: CHOICES gone and DEFLOST=>DEFROST
status 0/2 switched (0=OK)
Merge remote-tracking branch 'max/solar_water' into app-restructure

Conflicts:
	server/webapp/settings.py
water/DummyScraper
Merge branch 'app-restructure' into lookup-tables
AVERAGING of temporary values into permanent reading
why did I ever delete log.py?