clarified edge attribute update precedence in add_edges_from()
Merge pull request #1101 from arne-cl/master

clarified edge attribute update precedence in add_edges_from()
typos: space and correct object of conversion
Merge pull request #1104 from ajschumacher/patch-1

typos: space and correct object of conversion
Fix incorrect double underscore.