move the uploader code to the picker view
Merge branch 'master' of github.com:Automattic/sulfur