Merge remote-tracking branch 'upstream/master'
Remove ruby-version from repo
Display standard upload controls

Should help users who for whatever reason cannot use the
drag & drop facility.
Merge pull request #169 from robotmay/upload-improvement

Improved upload controls