Merge pull request #74 from jcannava/master

Merged automatically by jenkins after successful build test
Adding ldap options, ostensibly to bring AD support..
Merge pull request #75 from jcannava/ad

Merged automatically by jenkins after successful build test
change how mysql ip is gathered to account for potential vips
Merge branch 'master' of github.com:rcbops-cookbooks/keystone into api-separation
Merge pull request #76 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.