Make warden and rootfs part of base VM
Temporarily change name of base VM
Specify rvm version in vagrant config

This avoids a github API call inside of the
rvm install script, which sometimes fails because
github rate-limits pivotal
Install bundler before running warden setup
In chef recipe, remove app armor completely
Specify rvm minor version to avoid more rvm recipe issues
Bundle install before starting warden
Add quota to chef recipe
Merge branch 'preinstall-warden'

Conflicts:
	create_vagrant_box.sh
Revert "Temporarily change name of base VM"

This reverts commit 917202ac8381ed56fe4f0bf27b5a90e4281aa58b.