XMonad conf rearrangments
Merge branch 'master' of https://github.com/Graawr/config