made ldap as an option in config.ini
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from terro/master

made ldap as an option in config.ini