Incorporate updates for Cordova #7
Replace grunt references with gulp #3