battery time added, eth0 color added
Merge branch 'master' of https://github.com/jhamfler/awesome

Conflicts:
	.conkyrc
better volume handling and heads are now shown in the git info text