user search via ldap
Merge branch 'master' into upgrades
Merge branch 'upgrades' into ldap_updates
spec was breaking in uic because of param was object instead of id
refactoring user search for cleaner ldap lookups
Merge branch 'ldap_updates' into upgrades
allow customization to ldap searching and building

Conflicts:
	config/settings.yml
fix bad merge of settings.yml
get ldap attribute from yml file instead of settings

to avoid duplication
use last instead of first for getting the username of an ldap user
extra info for ldap howto
Read LDAP attribute from ldap.yml as opposed to reaching into private variables

See note on pull request #25
Merge branch 'ldap' into upgrades