style fixes
add more tests
Merge branch 'master' of github.com:dleinker/pyhmeter