magit, elisp-slime-nav
Merge branch 'simplified' of github-kototama:kototama/.emacs.d into simplified

Conflicts:
	lisp/packages.el