Efficiency data table now honors EFFICIENCY_MAPPINGS_ORDER. Fixes #156
Merge branch 't156'. Fixes #156