Fixes issue #55: Tidy up simulator Makefiles