Fixes Makefile for BSD make; #2565
fix the `run` target
Fix up `make test`
Merge pull request #2566 from gittip/fix-Makefile

fix Makefile for BSD make, closes #2565
Merge branch 'master' into fix-148