Personal: project mappings for kodemaker.no
Personal: what-the-emacs-d moved locations
Update clj-refactor, dash, expand-region
Don't let flyspell steal C-. in git-commit-mode
Misc
Use smartparens in java-mode
Update clj-refactor and multiple-cursors
Update clj-refactor
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.mc-lists.el
Organisation-management-web