xmonad changes

Conflicts:
	xmonad/xmonad.symlink/scripts/config.sh
	xmonad/xmonad.symlink/xmonad.hs
misc