Closes #2846: Config class does not overload the core Config class
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop