(Trace Analysis) Fixed the project so it works for edg4x

Also, cleaned up the Makefile and switched it to use the ROSE
Test Harness.
Merge remote branch 'origin/master' into HEAD