This is a monument to all my sins.

This get's pages working again - but this needs to be mostly rewritten..
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop