Updating dependencies
Initial phonegap upgrade to v3.3
Cleaning up build to reduce multiple config per dev and prod
cleaning up phonegap build
manual merge of upstream
manual merge of upstream