Update Makefile and remove dead engine code.

Ruminating on thread safety. We can use GCD, although custom queues requires 10.7
support, which means 10.6 falls over (which kills PPC I believe). Sigh.