added defaults to keystone module
Merge branch 'develop' of github.com:saltstack/salt into develop
renamed variables named id
added token default to keystone module
moar pep8 happyness
Merge pull request #7098 from KennethWilke/develop

Some improvements to the keystone module