Screwing around with ldap app settings
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop
Google auth can match users based on username and google apps domain now