Merge pull request #114 from jacobwagner/master

updated templates to match new test matrices
Merge pull request #115 from jacobwagner/master

fixed ldap/ad integration, fixed build decl wrappers