Fixing Pep8
Merge branch 'list_inherited_roles_backup' of https://github.com/rodrigods/keystone into list_inherited_roles_backup

Conflicts:
	keystone/assignment/backends/kvs.py