Cleaned up Makefile
Merge branch 'tonyDev'