Try fix Travis complaint.
Cont...
Merge branch 'drush-loop-over-time-periods' of github.com:Gizra/negawatt-server into drush-loop-over-time-periods

Conflicts:

negawatt/modules/custom/negawatt_normalizer/tests/NegawattNormalizerMeterProcessTestCase.test