Configure cinder to use keystone
Merge branch 'master' of https://github.com/jlabocki/superhappyfunshow