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

This reverts commit 1238ad7f2f3d101f8b8a5f6e98ec5604044d7ec8.