Updated to Cloud Foundry v2.
Merge pull request #1 from scottfrederick/master

Update for Cloud Foundry v2.