Merge pull request #3 from hal9k-illumos/master

DNS and Hostname setup fixes and tweaks
Fixup for pull request #3 - DNS fixes
Merge pull request #1 from omniti-labs/master

Sync with upstream