Fixed undeploy-and-delete.
Environment is now a parameter on the command line of deploy.cli.
Merge branch 'tools'