Cloudfoundry deploy

Some tweaks to get Swift to deploy correctly on CloudFoundry.

/cc @melima