Upgradle to gradle 1.6
Minor polish to gradle build