A more consistent collection triggers

Hi,

This is my proposal as a result of #537

I wasn't totally sure about ```empty:rendered``` so I ended up excluding it.

Regarding ```composite:collection:rendered```, isn't that redundant? Do you think that could be removed?