Fixing settings.py
Remove south dependency
Cleaning up after merge, updating to Django 1.7
Updated requirements.txt
Updating models for new migrations
Untracking migrations