Several relatively small fixes primarily motivated by changes in the python setuptools#513

cmickeyb merged 5 commits intohyperledger-labs:mainhyperledger-labs/private-data-objects:mainfrom

cmickeyb:mic.jun11.small_fixcmickeyb/private-data-objects:mic.jun11.small_fixCopy head branch name to clipboard