Blender Git Loki

Cycles: Filter Shader and Output nodes to their respective object/world node tree.

Some nodes only work in certain node trees, so don't show them in the Add Node menu when this is the case.
This can probably be expanded to Input Nodes too, but need to double check some cases here still.