Commented automatic addresses from node['ipaddress'], since it's not working (and not desirable in this case)
Fixed comment character for zone files.
Updated metadata to include name (makes Berkshelf happier).
Fixed merge.  I have no idea what happened there.