Refactor CfDeployer

Signed-off-by: Dan Wendorf <dwendorf@pivotallabs.com>