Modified Makefile to be a little friendlier about moving gtest around