Pass in other variables required by template
Merge pull request #1 from craiganderson/stable/havana

Pass in other variables required by template