More changes to smart switch device type
Merge branch 'master' of https://github.com/bmmiller/SmartThings