Starting the refactor over to better stuff.
Got uploading functioning.

This should resolve #33.
Merge pull request #44 from boushley/upload-rewrite

Rewriting the upload process to be safer