Use smartparens in java-mode
Update clj-refactor and multiple-cursors
Update clj-refactor
Merge branch 'master' of https://github.com/magnars/.emacs.d
Personal: Use lein trampoline to get killable processes
Map .cljs to clojure-mode
Do backward-kill-sexp on C-M-<backspace>
FFIP for .edn
Ignore more directories in FFIP
html-mode: M-k to kill attribute
Personal: zombieclj ffip
Update clj-refactor and dash
More commands for .mc-lists
Merge branch 'master' of https://github.com/magnars/.emacs.d

Conflicts:
	setup-paredit.el
Use crappy-jsp-mode for html, since it has better indentation
Update crappy-jsp-mode and expand-region
Merge branch 'master' of https://github.com/magnars/.emacs.d

Conflicts:
	site-lisp/crappy-jsp-mode