Update Django to 1.5.4
Merge pull request #156 from jvc26/django-update

Update Django to 1.5.4