Merge branch 'release/0.0.1' into develop
Upgrading to Django 1.5.4 per the DDoS security update
Making sure that error logging is working correctly
Merge branch 'develop'