Rewritten more DRY-ly
Merge branch 'rewrite_file_upload' of github.com:MontyPyBlog/MontyPyBlog into rewrite_file_upload