Revert "add option to cli tools to always reconnect to broker on error"

Revert "add option to cli tools to always reconnect to broker on error"
AND fix indent fails (I think by Angelo ;)

This reverts commit 30914f76042a15911b51884c275a9bb09c3568ee.

Conflicts:
	cli/hpfeeds.py