Fixed some problems and templatized upstart

- refereces to 'zk' class instead of 'zk_watcher'
- converted upstart job to a template so it can point back at puppetmaster