Added a new battery format for showing charging status

It shows "On" for charging and shows the percentage otherwise. Made it the
default.
Merge branch 'master' of https://github.com/abdulsattar/taffybar

Conflicts:
	src/System/Taffybar/Battery.hs