Fix for issue #257 - Make tradingcalendar specific to the TradingEnvironment 

I'm not sure to send this as it is or resolve merge conflicts on my copy then submit the pull request.