python 2 compatibility
added choice constants
Merge branch 'master' of https://github.com/keithasaurus/Django-Basic-Models

merge