XMonad updates

Mostly to support cmus