fixed ldap/AD keystone / service user integration, fixed ipython load
Merge branch 'master' of https://github.com/rcbops-qa/monster
Merge pull request #117 from jacobwagner/master

AD/ LDAP fixes