Fixing tests that broke in transition to python-keystoneclient v0.2
Merge pull request #22 from dklyle/master

Fixing tests to work with keystoneclient v0.2