Merge pull request #6 from kholloway/master

Smartthings plugin fixes