Sdist fixes

A bunch of sdist fixes I found while working with requirements.txt. I'm also researching a way to easily upload avocado to PyPI, given that `avocado` is already taken there.