Update backbone and underscore. _byCid not used anymore.

I simply ensured tests pass, I did not check the logic in depth. Feel free to comment.