Makefile changes
 combined thesis and future work