Change upload approach to something that should work consistently - re: #14
Merge pull request #15 from arobson/upload

Change upload approach to something that should work consistently