Fix dependencies on setuptools-git

Also fix a bunch of pep8 issues

Change-Id: Ib5a6f7aaa3e33b23ab4ea5be7b2b3e1832381d99
Fixes: JIRA OPENSTACK-482