Minor docs update
Tests obsoleted by #550
Merge pull request #555 from jkrocil/docs_update

Minor docs update
Merge pull request #557 from seandst/rm-old-ldap-tests

Tests obsoleted by #550

Going to risk a self-merge on this one. :)