Revert "Revert "Revert "Revert "Added indent option to cli.py""""

This reverts commit 03fde7784b0dba7bd9d7eadd6f68fdf8e72415cf.