Generalize multi-workspace startup config.
I don't ever use the circle layout
Merge branch 'master' into laptop-1366w-external

Conflicts:
	xmonad.hs