pep8 fixes
Merge branch 'n1k-plugin' of https://github.com/CiscoSystems/quantum into n1k-plugin

Conflicts:
	quantum/plugins/cisco/db/n1kv_db_v2.py
	quantum/plugins/cisco/n1kv/n1kv_quantum_plugin.py