Don't generate a proxy for WSDL-based integrations
Use global proxy for WSDL-based services
Merge branch 'master' into 3.0

Conflicts:
	package.json
	template/_wsdl/proxy/default/package.json
Fix version
Add generation data to CdmExternalSystem for Wsdl services
Use server-based operations to create model
Stay compatible with older model.json files
Convert emote to use oauth for Salesforce
Remove unneeded require
Fix usgs test
Allow running of individual regression tests
Update to OAuth-based salesforce
Allow running non-interactively
Merge branch 'master' into 3.0

Conflicts:
	package.json