Merge branch 'release/v0.8.7' into develop
2.0 refactor to using CustomQuerySet
wip: rewrite stuff
fix all() and remove use_for_related
test project admin definitions
fix a bug with django 1.5
Fix CustomQuerySet to call super, cleanup PEP8

CustomQuerySet wasn't calling super() so all kinds of errors were popping up.

Also cleaned up to match PEP8.

Also removed old managers that were commented out.
Fix CustomQuerySet to call super, cleanup PEP8
Merge remote branch 'auzigog/patch-2' into develop
Merge branch 'develop' into release/v2.0.0
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
Have SlugModel publish_by('slug) automatically.
Merge tag 'v2.0.1'

Conflicts:
	basic_models/managers.py
	basic_models/version.py
README