swapscreen: only swap clients on active workspaces

d'oh, stupid error
swapscreen: remove unneded local variable

refactoring...
Merge branch 'master' into mitch