Move puppet templatedir again.

Apparently the default is in /var for some reason.  I'm
pointing it to /etc/templates.

Also fixed a typo:  s/pupppet/puppet/

Change-Id: I51ce25af65573d93e91775bc8fe0bc3a478cf9d2