added default and twig variable overrides
Merge pull request #1318 from jadwigo/master

added default and twig variable overrides