More tidy up.

Added workspaces package.
Merge branch 'master' of github.com:mburrows/emacs.d

Conflicts:
	init.el