CSS and Javascript form the page were being ignored, for that of the page type
Fixes #2196. Anybody know why this was being done? Did I break other functionality? @adamfairholm @jerel
Random cleanup during previous commit
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop