Update elvis

Only update date on logfile when actually updating
Update UpdateStartupScript
Update energy_watch_zwave.py
Update energy_watch_zwave.py

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

Conflicts:
	server/energy_watch_zwave.py
Fix logic bug when finding plugs
Merge pull request #62 from interactiveinstitute/develop

Make master work again