global and template contexts are now merged

The documentation says `The template context will be merged with the global context` but this wasn't working, at least the way I understood it to. This update fixes that.