Xmonad cleanup
Merge branch 'master' of github.com:colbell/dotfiles

Conflicts:
	xmonad/xmonad.standalone.hs