Add retry logic

misc other changes, including 7 day availability window, and adding ePID as other Identifier on OnDemands
I'm becoming less and less of a fan of the decorator pattern being used to wrap essential functionality, for the reasons in http://metabroadcast.com/blog/template-vs-decorator. wdyt?