updated
Merge branch 'master' of https://github.com/julior/dotfiles

Conflicts:
	.emacs.d/scala-repl.el
Fixed scala/clojure repls