Cleaned up makefile and install / test / clean code