Applied patch to bring it up with old 1.2.1 release branch.
Merge branch 'master' into management_console_1.2.1

Conflicts:
	netkes/account_mgr/user_source/group_manager.py
Neglected to hit save before committing previous merge conflict.
WIP #6: Added group versus OU autodetect, started renaming functions.
WIP #6: Updates to support multiple LDAP versions.
Revert "WIP #6: Updates to support multiple LDAP versions."

This reverts commit 6e34385b39ed488a28edbd88d6354f20db53e196.
WIP #6: nice, clean implementation of _get_group_group and refactoring the user detail building out.
WIP #6: Implemented _get_group_ou(), now just needs testing.
Fixes #6 : Group / OU-based searches work right now. Unified AD / POSIX LDAP searching.
Merge pull request #7 from SpiderOak/ou-and-group-lookup

Ou and group lookup