Upgrade to gradle 2.1