Merge pull request #408 from ggiamarchi/keystone-v3-auth

Keystone v3 service catalog + auth scope