Refactored upload code a bit
Updated uploads and authentication sections in the README
Merge branch 'master' into heroku