Drop a superfluous if-else

Might as well just return the result of the comparison. No change in
behaviour but it makes the code just a little bit cleaner.
workspaces: Allow non-existing workspaces

When using quickswitch with workspaces, it's very helpful to be able to
create new ones on the fly using the same i3 bindings as you would for
when dealing with pre-existing ones.

When no target is found in the lookup table, this patch overrides the
lookup result and simply uses whatever workspace name the user supplied.

In my view, this behaviour is much more intuitive, and tremendously
helpful.
workspaces: Allow moving containers to workspaces

This patch adds the possiblity to combine -m and -w to move the current
container to the selected workspace. I personally feel that the feature
is exceedingly helpful, but I'm not entirely sure that overloading the
-m option in this way is desirable.
Merge 'catharsis/quickswitch-patches'

Conflicts:
	quickswitch.py
Remove superfluous if/else
Move container to workspace with -j.

Also add cooperation between -j and -r, similarly to
how -m and -r work together.