explicit logic
Merge pull request #116 from cjoelrun/ldaplogic

explicit logic
fixed ldap/AD keystone / service user integration, fixed ipython load
Merge branch 'master' of https://github.com/rcbops-qa/monster