changing django.conf.urls.defaults to django.conf.urls
Merge pull request #24 from nburlett/develop

Don't require integer primary keys
Merge remote-tracking branch 'bolster/develop' into develop
Bumped up version
Simplified version number handling
Fix `setup.py bdist`

Fixes #25 by reverting part of cadd8fa6 that pulled in incorrect
package_data