Merge pull request #200 from dburdick/develop

Graph based Provenance and PLFM-345, PLFM-381
small change to entity bundle
fixed merge conflict
Merge pull request #201 from john-hill/develop

small change to entity bundle
Merge pull request #202 from dburdick/develop

Small code review changes