Massive change to allow ntest to be built with both VS 2013 and gcc 4.7
Remove crap file