File uploads should be canceled as well

Move the block for doing file uploads into the block that checks whether they cancelled the form submission.
Merge pull request #124 from ubergeek42/fix-upload-cancel

Fix bug with cancelling file uploads