Added new Makefile and bug fixes

I added the new metrosim makefile (named testing.make) that will take
place of the old makefile once we get stuff working. Also included lots
of fixes in the build.