added magit
Merge branch 'master' of github.com:jchochli/dotfiles

* 'master' of github.com:jchochli/dotfiles:
  enable 4clojure

Conflicts:
	home/.emacs.d/init.el