Added JDEE.
Merge branch 'master' of github.com:LuminousMonkey/.emacs.d

Conflicts:
	init.el