BRANCH 4.2: removed extra cherrypy folder and fixed upload to be more
efficient so that it doesn't copy the uploaded file.  For now, it moves
the file instead of creating directly to the temp folder.