manually merging remram44/xkcd-688

no `from pylab import *`, resolves some PEP8, removes “bogus” line