Changes Salmon to Notification.
Combines Entry into Activity.

You can't really have an Entry without an Activity, so let's go with the
spirit of ActivityStreams. Everything is an Activity, and an Activity
has content.

In Atom representation, that becomes an <entry> with an extended element
<activity:*>, but in the JSON ActivityStreams, it is an activity proper.