Groovy mode form site-lisp was replaced with one form MELPA
Merge branch 'master' of github.com:notanone/.emacs.d