Update for gradle 2.0 and the cm plugin 1.19