Remove guessed future engines. Add place holders to ease merge conflicts. Reorder top level Makefile slighty.