Fix #235 - custom start/end symbols were global to all environments.
Merge pull request #278 from amyboyd/235

Fix #273 and #235 - custom start/end symbols were global to all environments.