fix merge comments from #528

this includes removing the duplicate `provision-controller.sh` script (using @tombh's `provision-vagrant-controller.sh` script now), renames the vagrant box to deis-controller to avoid naming collisions with other vagrant boxes, and a small typo in one of the comments.