Upgrades to groovy 2.1