updating for merge
Merge branch 'master' of github.com:the2hill/java-keystoneclient
Initial commit