Cleaning up repository.

Removed the catch include due to using git submodules for the Catch
repository.
Modified Makefile

Added in an include statement to the Make recipes so that the Git
submodule is now used.