custom
merged
truly merged
 fixed parens
Merge branch 'master' of https://github.com/wolfmanstout/dotfiles

Conflicts:
	.emacs
added clojure support and some changes from starter kit