emacs: paredit for clojure-mode
Merge branch 'master' of https://github.com/cmerrick/dotfiles

Conflicts:
	emacs/emacs.symlink