update to Groovy 2.1

Update to Groovy 2.1.0 to avoid http://jira.codehaus.org/browse/GROOVY-5868 in Groovy 2.0.6

Test suite passes with this update.