Cleaned up machine and graphics interfaces
Merge branch 'master' of github.com:ToyDragon/WeBuiltThisCity