Merge pull request #1240 from jmaas/master

Remove support for configuring LDAP through Koan.
Merge pull request #1241 from jmaas/master

Fix: koan/configurator.py:30: 'subprocess' imported but unused.