Removed Silly Whitespace

This whitespace was actually inducing confusion
Stitched-on the Minimal django upload example

This could not have been done without Akseli Palén, so many, many thanks
to them for their assistance.

http://stackoverflow.com/questions/5871730/need-a-minimal-django-file-upload-example
Renamed variables to better suit our project

This includes renaming many things to 'upload' and changing the
directory files will be uploaded to.
Added a todo list
I tried to make it more obvious

I really did
Revert "I tried to make it more obvious"

This reverts commit a8649ca58a99f06043f4f207efea921bcf4de4d7.
Merge branch 'master' into Testing-Uploads