Merge xmonad code into one file
Merge branch 'master' into apricot

Conflicts:
	xmonad/lib/Common.hs
	xmonad/lib/Keys.hs
	xmonad/xmonad.hs