Merge pull request #1 from gaskelld/master

Update for mEIC
Merge pull request #2 from gaskelld/master

Meic updates
Updates from work for EIC R&D proposal.