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

This reverts commit db58a7059faa712df7c1a82989e09ad53e7af213.