Set correct upload route and fix uploader (note: not tested but seems co...

...rrect)
Not sure how to test it locally (yet to fully setup Flicker credentials) but this seems correct, so I suggest somebody with commit access to test before merging