Cleanup

Signed-off-by: Mike Gehard <mgehard@pivotallabs.com>
Naming is wrong

Signed-off-by: Mike Gehard <mgehard@pivotallabs.com>
Make dumping logs respect org id

Signed-off-by: Mike Gehard <mgehard@pivotallabs.com>