Support python 3

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Merging conflict

Conflicts:
	tests/integration/cli_test.py