Cleanup cloudfoundry 'sandbox' a bit.
Merge branch 'dev' of github.com:scripted-editor/scripted into dev