Updated opdemand/buildstep build procedure.
Fixed #232 -- added vagrant support
Merge branch '232-vagrant-dev' of https://github.com/opdemand/deis into 232-vagrant-dev

Conflicts:
	Vagrantfile
	contrib/vagrant/prepare-ubuntu-box.sh
	contrib/vagrant/provision-vagrant-controller.sh