Deleted .emacs.d/elpa.
Merge branch 'master' of github.com:nipra/.emacs.d
Adding company-mode.
Adding emacs-eclim.
Adding elpa.bk.
Adding java-mode-indent-annotations.el.
Eclipse integration.