Some more code for template.py
Merge branch 'master' of github.com:fabsor/badger