Put buildpacks in source directory
Merge git://github.com/cloudfoundry/vcap-staging