updated to be self contained
Merge branch 'master' of github.com:kbase/uploader