More removing of doubling up of notifications for apn

There was still some issues with the payload for apple notifications:

```
{
  alert: null,
  aps: {
    alert: "Buckingham Palace",
    sound: "default"
  },
  data: {
    content_id: some_id
  },
  payload: {},
  sound: null
}
```

When it should just be:

```
{
  aps: {
    alert: "Buckingham Palace",
    sound: "default"
  },
  data: {
    content_id: some_id
  }
}
```