Added Catch unit testing framework, minor Makefile changes