Fix copy & paste from emacs
Changed battery warning from 10% > 20%
Merge branch 'master' of github.com:daniellawrence/dot-files

Conflicts:
	dot-emacs
	dot-zshrc