Upgrade to gradle 1.7