Merge pull request #117 from jacobwagner/master

AD/ LDAP fixes