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' into merged

Conflicts:
	setup-magit.el
	site-lisp/clj-refactor
	site-lisp/dash
	site-lisp/expand-region