Add volume control to xmonad
Added volume to dzen
Told dzen to only check the volume once a minute.
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
Returned dzen font size to 12
Added more icons for dzen
Added speaker icon to volume in conky
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
Fixed AC icon on laptop in conky
Fixed Volume icon in conky
Remove battery_short from conky

I trust the battery icon enough that I no longer need battery_short
Shortened time in conky
Merge branch 'master' into laptop

Conflicts:
	.conkyrc