merge upstream into master

MANIFEST.in

@@ -6,9 +6,6 @@ include HISTORY.rst
 include LICENSE
 include README.rst
 
-recursive-include build *.xml *.jar *.xsl *.txt *.properties *.sh
-recursive-include ci *.xml *.jar *.xsl *.txt *.properties *.sh *.py
-
 recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+# Critical Changes
+
+# Changes
+
+# Issues Closed

README.md

@@ -1,3 +1,7 @@
+# CumulusCI 1.0 (Ant based) Users, **PLEASE READ**
+
+The master branch now contains CumulusCI 2 which is not backwards compatible with the previous CumulusCI that was based on Ant.  If you are using the Ant targets, please switch to using the `legacy-1.0` branch of the repository which contains the Ant based version.  Or, consider upgrading to CumulusCI 2.
+
 # CumulusCI
 
 CumulusCI is a command line tool belt and set of reusable Python classes useful in the development and release process of building a Salesforce Managed Package application.

README.rst

@@ -35,37 +35,37 @@ Installation
 Quick Start
 -----------
 
-This section provide a brief example of the commands you'd use to start a new project once you have CumulusCI installed
+This section provide a brief example of the commands you'd use to start a new project once you have CumulusCI installed::
 
     $ cd <Your_Local_Repo>
-    $ cumulusci2 project init
+    $ cci project init
         project_name: MyProject
     $ cat cumulusci.yml
         project:
             name: MyProject
-    $ cumulusci2 org config_connected_app
+    $ cci org config_connected_app
         client_id: 12345890
         client_secret:
-    $ cumulusci2 org connect dev
+    $ cci org connect dev
         *** Opens a browser at the Salesforce login prompt to complete OAuth grant
-    $ cumulusci2 org list
+    $ cci org list
         dev
-    $ cumulusci2 org info dev
+    $ cci org info dev
         *** Displays the OAuth configuration info for the org named "dev"
-    $ cumulusci2 org browser dev
+    $ cci org browser dev
         *** Opens a browser tab to the org using OAuth to bypass login
-    $ cumulusci2 org connect --sandbox test
+    $ cci org connect --sandbox test
         *** Opens a browser at the Salesforce login prompt to complete OAuth grant
-    $ cumulusci2 org list
+    $ cci org list
         dev
         test
-    $ cumulusci2 task list
+    $ cci task list
         *** List all available tasks
         deploy: Deploys the src directory to the target Salesforce org
-    $ cumulusci2 task run --org dev deploy
+    $ cci task run --org dev deploy
         *** Runs the "deploy" task against the "dev" org
-    $ cumulusci2 flow list
+    $ cci flow list
         *** List all available flows
         deploy_dev_org: Runs a complete deployment against a dev org including dependencies but not running tests
-    $ cumulusci2 flow run --org test deploy_dev_org
+    $ cci flow run --org test deploy_dev_org
         *** Runs the "dev_org" flow against the "test" org