Dataset.merge ignores conflicting variable attributes

This is meant as a temporary fix until we figure out the right logic --
note the comments in the docs to this effect.
Use exact array_equal for dtype=object in xarray_equal
Merge pull request #76 from akleeman/ignore-attributes-in-merge

Dataset.merge ignores conflicting variable attributes