clean up code and move to Groovy 2.0.0 and spock 0.7 snapshot