Cleanup states.
Merge branch '134' of github.com:Gizra/negawatt-server into 134