Xmonad: filter scratch-terminal by resource, not by name
Merge branch 'master' into desktop