Fix things up to work with nova.

Add extern/six back - turns out setup_requires isn't transitive.
Make sure .gitignore is right.
pep8/pyflakes fixes.

Change-Id: I61fe65815d924fdcaf742e4e6af6a2885e8c2354