Correct name/content lists for template_content, merge_vars, global_merge_vars.

Fixes #24.
Version 0.3.1