Steal Makefile and matcher goodness from @pushrax