change CAISO and ERCOT times, and decrease concurrency
Merge branch 'master' of https://github.com/WattTime/watttime-grid-api
add email on celery error