shorter, simpler conky in dzen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.dzen/conkyrc-dzen