Move to Cloud Foundry Incubator

Merge this after the repo moves to -incubator to fix up all the import paths

(The travis failure below is expected until the repo is moved; after the repo move someone should kick off travis to make sure I fixed everything up properly in this PR; theoretically it should go green)