Cleaning up some crufty leftovers

plus fixing a missing io.EOF check
Merge branch 'touchup' into uploader-tests
Adding a bunch more tests, eh