Got autocomplete on prisoner id working for the letter input
Merge branch 'master' of github.com:hwh33/PrisonerExpress
Minor fixes for the old upload method
Fixed some minor upload bugs and some problems with auto-complete
Merge branch 'master' of github.com:hwh33/PrisonerExpress

Conflicts:
	PrisonerExpress/prisoner_views.py
	PrisonerExpress/templates/new_letter.html
	PrisonerExpress/test_input.py
	PrisonerExpress/tests.py
Merge branch 'master' into ross-branch

Conflicts:
	PrisonerExpress/letter_views.py
	PrisonerExpress/templates/new_letter.html