Move environment_dict to base_template_context, remove method

as per robs comment in pull request