[xmonad] Two patches for xmonad-contrib: new layout modifier and new "conditional" layout