Merge with code generated using OpenStack cookie-cutter

Adjust imports, requirements etc to get py27 and pep8 working