Merge pull request #50 from jordandukart/7.x

Let embargo take an AbstractObject as well as a pid.
Myriad of bug fixes and improvements.