Merge template data into global data and preserving existing values
Merge pull request #14 from stimmins/master

Local template data should merge onto global template data