Fix name
Don't source zlocal

Local settings are managed by git instead
Tweak zsh settings
Merge branch 'master' into chewbacca
Clean up default config
Change network device names
Merge branch 'master' into chewbacca

Conflicts:
	xmonad/conkyrc