Tweak zsh settings
Clean up default config
Merge branch 'master' into zaalbar

Conflicts:
	xmonad/conkyrc
Fix device names