modified init.el
Merge branch 'master' of https://github.com/chrde/clojure-repo

Conflicts:
	dotfiles/init.el