starting changes
adding new formatter class
started updates to json response
Merge branch 'develop' into brian-scratch
Finished writing results to file
Merge branch 'brian-scratch' into develop
Merge branch 'develop' of github.com:proofpoint/kairosdb into develop