Xmonad updates
Xmonad config is now hostname aware
Merge branch 'master' of github.com:obreitwi/dotfiles_desktop

Conflicts:
	xmonad/xmonad.hs