fixed device type names
Merge branch 'master' of https://github.com/pauljdehmer/house-server