made changes to models, no long have time stamps
updated views
summary complete except quebec
small change
finished cron jobs
finished scrapers
added hoep_pre intrahour
fixed models.pyc conflict
Merge branch 'master' into ch_models

Conflicts:
	data_collect/models.pyc