Remove legacy variable templating
Merge pull request #22 from sloria/1.6-fixes

Remove legacy variable templating