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'