Makefile: added OndemandX & Intellidemand Governors and reorder