Merge pull request #3 from jonbinney/groovy-devel-catkinized

Groovy devel catkinized