Setting the stage for better pagination
Change to the content filter and it's use

It seems like a bad idea to have the content filter rely on a specific key, and the rewrite stuff it was doing for urls was flawed. We still need it to mark content as safe though.
Don't set next and previous urls in the models
Pass models to views, not arrays
Use the parent make method