bump Django version to 1.5.4
Merge branch 'torchbox' (update Django version to 1.5.4)