fixed bug in merge_attributed, added tests to cover regression in the future
added comments in test
Merge pull request #31 from gpratt/master

Merge Attributes fix