changed from Zekton to Liberation Mono/Sans (FontSize:8!)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.dzen/conkyrc-dzen
	.gtkrc-2.0
	.xmonad/xmonad.hs
	bin/dm