prevent battery_charge call from erroring in themes when battery plugin not enabled
Merge branch 'master' of https://github.com/revans/bash-it
updated brunton theme to use battery_charge
Merge pull request #367 from benbrunton/master

Ensure that battery_charge function is safe to use in themes
Merge remote-tracking branch 'upstream/master'