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

Updated django to 1.5.4
allow a field called 'text_xls_form' to be passed instead of a XLS file. addresses #1239
removing unnecessary imports
Test csv form publishing
fixed bug that would always assume wre publishing a text_xls_form
Merge pull request #1244 from modilabs/allow-csv-upload

Allow csv upload
Fixed help text that indicated an id_string was required
Merge pull request #1246 from modilabs/restore_backup_help_fix

Fixed help text that indicated an id_string was required
Merge branch 'master' into tagging

Conflicts:
	requirements.pip