making a few changes
Merge branch 'master' of https://github.com/ShitWeDo/stimpy