slimming down and adding an HTC device match
Merge pull request #189 from dmolsen/do-htc-fix-reorged

Slimming down and adding an HTC device match