DejaVu -> Liberation Mono / powerline-fonts installed as pkg
changed dzen font to Liberation Mono / spacer adapted
changed conky to show date again
update to Liberation Mono
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.dzen/conkyrc-dzen
	.xmonad/xmonad.hs