Added changes to the Makefile and .cppproj files to make them play nice nice.