Revert "Merge branch 'master' of https://github.com/mjshiggins/OSsim"

This reverts commit 1730bcab4c4dab0c4de46d73a493e7bef8864235, reversing
changes made to 1ed495fe4deb2829962c1dac3cc1a62a1d592348.