Fixes for PyPi - I'm going to have to write a post about using PyPi.