Also handling delete and undelete now.
Merge dev into feature/150-handle-delete-undelete
Fixing compilation error that appeared after merging dev into this branch.
Merge pull request #204 from SalesforceFoundation/feature/150-handle-delete-undelete

Also handling delete and undelete now.
Merge dev into feature/184-rollup-test-refactor