Upgrading to gradle 1.7