Address pending deprecation of Model._meta.module_name in Django 1.6
Merge pull request #1126 from mkai/_django1.6_model_name

Address pending deprecation of Model._meta.module_name in Django 1.6