diff --git a/README.rst b/README.rst
index f45a6dc8f..cf617508b 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ The installation is split in to two parts.
 The first part is a bash script which lays the basic groundwork of installing
 Ansible itself.
 
-Edit ./inventory/group_vars/all.yaml to match your environment.
+Edit ``./inventory/group_vars/all`` to match your environment.
 
 - If MySQL is already installed, update mysql_password to match your local installation.
 - Change network_interface to match the interface that will need to service DHCP requests.
diff --git a/env-setup.sh b/env-setup.sh
old mode 100644
new mode 100755
index f8022ae4d..37759e0af
--- a/env-setup.sh
+++ b/env-setup.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 
-sudo apt-get -y install git python-pip
-sudo pip install jinja2
+sudo -H apt-get -y install git python-pip
+sudo -H pip install jinja2
 
 u=$(whoami)
 g=$(groups | awk '{print $1}')
 
-mkdir -p /opt/stack || (sudo mkdir -p /opt/stack && sudo chown $u:$g /opt/stack)
+if [ ! -d /opt/stack ]; then
+    mkdir -p /opt/stack || (sudo mkdir -p /opt/stack)
+fi
+sudo -H chown -R $u:$g /opt/stack
 cd /opt/stack
 
 if [ ! -d ansible ]; then