fix merge comments from #528

Author: Matthew Fisher

contrib/vagrant/Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64-3.8"
+  config.vm.box = "deis-controller"
 
   # Ubuntu 12.04.3 LTS base with 3.8 kernel (ready for Docker)
   config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vbox.box"

contrib/vagrant/provision-controller.sh

@@ -13,7 +13,7 @@ THIS_DIR="$(cd $(dirname $0); pwd)" # absolute path
 CONTRIB_DIR=$(dirname "$THIS_DIR")
 CODE_BASE_DIR=$(dirname "$CONTRIB_DIR/../../")
 
-# For those upgrading from the pre-containirize branch, they may still have some redundant files
+# For those upgrading from the pre-containerize branch, they may still have some redundant files
 # in their code base.
 if [ -h $CODE_BASE_DIR/deis/local_settings.py ]; then
   echo "Removing old local_settings symlink"
@@ -129,4 +129,4 @@ popd
 # Need Chef admin permission in order to add and remove nodes and clients
 echo -e "\033[35mPlease ensure that \"deis-controller\" is added to the Chef \"admins\" group.\033[0m"
 
-set +e
+set +e