I suspect that I messed things up. The last two commits are what I really want in there:
If this is impossible to work with, I suppose I'll try it again after somehow cleaning up my fork (is there a way to do that without deleting and create a new one?)
We can definitely help you to clean up your fork; jump into IRC sometime and ask about it.
Add Estimated Battery Charge remaining
Add 'Seconds on Battery' and 'Estimated Minutes Remaining' as states
I found a helpful post on stackoverflow on how to clean up the mess I made. I think this pull request now looks a lot nicer.