Jeffrey collectors

This is much the same as the previous pull request with additional support for updating/deleting collectors as well as addressing the comments. Want to actually merge this one before I start working on the blade APIs.

@weirded @sebastian-mies