Fix Cordova 3.6.0 deprecation warnings, ready for Cordova 4.0.0