Big RDF cleanup
Fix Engagement.__unicode__()
Merge branch 'pasr' into bdis