fixed the cli tool to work in Python3, and moved some

requirements around to avoid Python2.6-specific configs