> Can you reconcile the upload_file method in common.py with this one and have a single implementation?

Done. Also file uploading in textbook.feature was fixed (There was an incorrect file path). See the following screenshot:
![screen shot 2014-03-25 at 10 39 22](https://f.cloud.github.com/assets/1247491/2510840/72632fb8-b40d-11e3-9d5a-2172cb85cefd.png)