Fix thin dependency order
Ensure that webrick puppetmaster is stopped before starting nginx; caused errors on first run
Add hosts entry to thin test
Add 'puppet' host entry to simplify testing of a puppet agent run