Fix bug with battery power detection.
Merge branch 'master' of github.com:davexunit/.emacs.d

Conflicts:
	init.el