cleanups
Merge branch 'object_classes'

Conflicts:
	ldapdb/models/base.py