implemented cli, placeholders in defaults.json for report modes
Merge remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/benjaminestes/Pyscape
cleaning up