assorted updates
Groovy mode for gradle, org mods, disable gradle mode for now
Merge