Changed upload functionality to one-step uploads.
Merge branch 'master' of github.com:truewalrus/ocnow