Make it possible to compile haskell scripts
Merge branch 'master' into grapefruit
Clean up
Merge branch 'master' into grapefruit
Merge xmonad code into one file
Merge branch 'master' into grapefruit

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