change ldap timeout back to 10S.

and other small fixes.
Merge pull request #21 from ebf/xiaodong

change ldap timeout back to 10S.