pull importedFrom and model type back into wip branch
re-update generated Interactives

importFrom and model type in Interactive model refs

changes lost during rebase
use generic Energy2D html page for models w/o pages