Adding battery events
Merge branch 'master' of github.com:jnurse/nurture