Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'

Conflicts:
	docs/source/index.rst
	mediagoblin/templates/mediagoblin/auth/login.html

diff --cc docs/source/index.rst
index e7fda4ad599e8acf046393a258721207eaef6438,cad3c0333842fc6bdcac5be797164caf6c5b7c4d..75a5b66e1619118577cd8c73100807541d8952b1
--- 1/docs/source/index.rst
--- 2/docs/source/index.rst
+++ b/docs/source/index.rst
@@@ -56,11 -56,10 +56,12 @@@ Part 2: Core plugin documentatio
  
     plugindocs/flatpagesfile
     plugindocs/sampleplugin
 -   plugindocs/oauth
     plugindocs/trim_whitespace
     plugindocs/raven
 +   plugindocs/basic_auth
 +   plugindocs/openid
 +   plugindocs/persona
+    plugindocs/ldap
  
  
  Part 3: Plugin Writer's Guide