Adding emacs-eclim
Removing jdee
Merge branch 'master' of github.com:alexdforeman/.live-packs

Conflicts:
	alexdforeman-pack/init.el
Adding emacs removing JDEE
Merge branch 'master' of github.com:alexdforeman/.live-packs

Conflicts:
	alexdforeman-pack/init.el