Merge pull request #16 from cider-team-mercury/energetics

Energetics
added 'wishlist' quantaties to model_suite