More merge issues fixed.

Refs #232.
Rename form input element to upload_file

The rest of the code relies on it being called that too much, so this is the
simplest solution. Refs #232.