laptop conky
temp

Conflicts:
	dzen2/conky_dzen
Merge branch 'master' of http://github.com/abresee/config

Conflicts:
	dzen2/conky_dzen
well i guess i need multilib