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
Use crappy-jsp-mode for html, since it has better indentation
Update crappy-jsp-mode and expand-region
More commands for multiple cursors
FFIP: Don't swallow my "layout" files

- they matched against "out"
Personal: 4-char indent in SPiD
Update clj-refactor and multiple-cursors
Add some .ignore
Set fill-column to 80 by default.
Add the particularly useless single-quotes-mode
Personal: SPiD settings
Merge remote-tracking branch 'upstream/master' into merged

Conflicts:
	.gitignore
	site-lisp/clj-refactor
	site-lisp/dash
	site-lisp/expand-region
	site-lisp/multiple-cursors