Update local pypi proxy settings
Merge branch 'master' into plone-4.3
Add ldap