Remove weather from taskbar
Set dzen to single line
Switch mail to icon
Merge branch 'master' into laptop

Conflicts:
	.conkyrc