Merged with Evervolv Makefile.. 3rd time is the charm