Switched to Django 1.7
Updating EAK
Merge branch 'django-1.7'
Removed unnecessary settings in test