Updated to Groovy 2.2.1
Switch back to Groovy 2.1.6