Updated django to 1.5.4
Merge pull request #1242 from modilabs/django_1_5_4

Updated django to 1.5.4