Formatting and spalling

Signed-off-by: David Varvel <dvarvel@pivotallabs.com>
Extract shared upload logic into uploader package

Signed-off-by: David Varvel <dvarvel@pivotallabs.com>