Upgraded Groovy to 2.1.1 and Spock to 0.7