Add CREDITS file.
Update copyright
Update README.
Merge remote-tracking branch 'upstream/master' into move-django-settings
updating copyright line and adding a CREDITS entry