Lots of changes, mainly to xmonad.hs and such.