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

This reverts commit 44a51ab1d0d9aa1c7ad0863c0e5219a7424c34c5.