Fix indentation error
Merge branch 'develop' of interactiveinstitute/elvis into develop

Conflicts:
	server/energy_watch_zwave.py