updated for multiple sensors and pump
Merge branch 'master' of ssh://github.com/sensa/sensa.io