Merge pull request #288 from jamiehannaford/os-keystone-users

OpenStack and Rackspace identity users