PLT-530 - MarketDataEnvironment, part 2
Merge pull request #294 from OpenGamma/topic/market_data_environment_pr2

PLT-530 - MarketDataEnvironment, part 2