Adding the ability to have environment variables in templates.

Also removing the podgroup since it wasn't really used or needed.