Fix CustomQuerySet to call super, cleanup PEP8
Combining merge request #8 from Hamms; rearranged ModelAdmins to enforce proper inheritance and added activate/deactivate actions
Merge commit 'a9d9f4fe884f37b91a392066f3dbf85d5ef41cfa' into develop

Conflicts:
	basic_models/managers.py
Merge pull request #19 from krimkus/develop

Rearranged ModelAdmins to enforce proper inheritance and added activate/deactivate actions
Merge remote branch 'origin/develop' into release/v2.0.0