Added -p flag to use pmset for battery status: see
https://github.com/Goles/Battery/issues/7
Use of heredoc, reorganization, and replacing [ with [[ (always recommended)
Changed to reflect -t option, removed trailing whitespace
Merge branch 'pmset'
Merged ivanvc/master : Display a lightning when connected

Conflicts:
	battery
Merge branch 'lightning'
Merged creaktive/master : More concise ioreg arguments

Conflicts:
	battery
Merge branch 'concise-ioreg'
Merge pull request #14 from wolfcore/master

Great stuff... I had a working implementation for the lightning thing but you beat me :) , cheers!