Add Copyright Sign to C-x 8 (c)
Update clj-refactor, dash, expand-region, js2-refactor, s
Personal project mappings
Set up org-capture
Magit: Don't confirm when unstaging
Better colors for ediff
Ignore .cask when finding file in project
Don't use eproject to find project root

- it's not happy in special buffers
Treat ns/var as different symbols when hippie expanding
Clojure: Cycle between ( [ and {
Clojure: Warn about missing nREPL instead of doing stupid things

Looted from @samaaron's emacs-live
Save minibuffer history between emacs sessions
More neat unicode bindings for C-x 8
Remove god-mode for now, try again later :)
Add prodigy
New commands for .mc-lists.el
Merge branch 'master' of github.com:magnars/.emacs.d
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.mc-lists.el
	site-lisp/clj-refactor
	site-lisp/dash
	site-lisp/expand-region
	site-lisp/js2-refactor
	site-lisp/s
updated submodules
Mfinn should not look oup in grunt_temp files