In a special case of execFile(model.json) we now print out returned status
strings from operations; this makes the model deploy output a little more
explicit.
Bump version number to show Steve's changes
When creating a virtual type the corresponding operation's return type
should be set to the name of the virtual type.
When deploying a virtual operation we no longer delete and re-create the
CdmType; instead we just attempt to create the type and ignore the "type
already exists" error. This will be dramatically faster when deploying
virtual ops to the global tenant.
Bump version of dependency on emsfdc in templates
Bump version after rebase
Implementing new list options
Merge branch 'master' into 2.1

Conflicts:
	package.json
Implement additional options for list command
Merge from master