added clarification to recipe add/get usage, closes #568
Merge branch 'develop' of github.com:scopatz/cyclus into develop
updated market model tests for context usage
Merge branch 'market-context' of github.com:rwcarlsen/cyclus into rwcarlsen-market-context