- tweaked makefile to hopefully allow development in feature branches