Modified settings so only ldap login appears
Modified authentication module for accessing University of Manchester ldap
Removed hardcoded database password - a new secure password should be set when deploying
Changed wording of form to re3flect login method
Changed wording on form to reflect required login method
removed space from text (user name now username)
changed password from one in use on production for security concerns
password changed for security
Merge branch 'bergmanlab' into UoM_ldap

Conflicts:
	settings_local.py

merging bergmanlab with UoM_ldap