Configure /etc/hosts and /etc/puppet/puppet.conf.
Fix option parsing.
Merge pull request #5 from seattle-biomed/upstream

Upstream