Some minor fixes

Fixes to templates.py. Added a few more
elements to everything.json. Also tweaked
the builder module to properly take a
string with comma-separated elements