bugfixes to catkinization
Merge pull request #30 from jonbinney/groovy-devel-catkinized-1

bugfixes to catkinization