Fixes missing import and arg parser reference
Merge branch 'master' into develop

Conflicts:
	hgip/api.py
Merge branch 'develop'