PEP8 cleanup
#25 Fix sphinx 1.1 build errors on readthedocs (hopefully)