Handle pushing skype to the appropriate workspace.
Merge branch 'master' into laptop-1366w-external

Conflicts:
	xmonad.hs
Rename workspaces to be more relevant to work.