Vov 1585

If anyone has any suggestions/changes/comments have at it.  I'm not sure how to manage the LDAP code I've added.  There are a few pieces I haven't committed because they are NU specific but I'm not sure how I should incorporate them.