Rework of Sean's HiSi importer/planner changes
This takes Sean's HiSi importer/planner change, and adds one small change to the planner to try to address an issue w/ the single layer case where we try to DEVICE composite a layer we only pretended to import.
Edited by John Stultz