Resolved merge conflict and further cleanup

README-CUSTOM-PROPERTIES.md

diff --git a/README-CUSTOM-PROPERTIES.md b/README-CUSTOM-PROPERTIES.md
new file mode 100644
index 0000000..2fe1c33
--- /dev/null
+++ b/README-CUSTOM-PROPERTIES.md
@@ -0,0 +1,6 @@
+# Custom Properties
+This installation framework has been parameterized. This means that
+properties or variables can be passed to modify the output. These
+additional properties are set to sensible defaults within the framework
+but are available for customization. These properties can be set in the
+`custom-properties.yml`.

README.md

diff --git a/README.md b/README.md
index 25f61a2..d50faae 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@
 1. `ansible-playbook setup.yml`
 1. Update the credentials.yml file as indicated below.
 1. Add the license.txt file to `~/.apigee-secure/license.txt`
-1. Configure ansible to work with the correct configuration using: `export ANSIBLE_CONFIG=~/.ansible/configurations/vz-edge-1701-aio.cfg`
+1. Configure ansible to work with the correct configuration using:
+    `export ANSIBLE_CONFIG=~/.ansible/configurations/edge-1701-dc1.cfg`
 1. `cd ~/apigee-workspace/apigee-opdk-playbook-workspace/apigee-opdk-playbook-installation-single-region`
 1. `ansible-galaxy install -r install-edge-requirements.yml`
 1. The first invocation should be: `ansible-playbook install-edge.yml --become --become-method=pbrun --tags=cache,ds,ms,rmp,qs,org`