Upgrade to groovy-2.1.0, closes #19