Removed local cache of groovy-mode; upstream has merged my changes