Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 3.0/develop
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 3.0/develop
Fixed integration tests, which currently only cover installer.
These are clearly not covering as much of PyroCMS as we would all like, but having installation covered is huge. It means we know that whatever we do, things can at least install properly.

The more CodeIgniter code we delete and the more PSR-0/1/2 code that comes in, the more unit tests we will get. 3.0 will be a LITTLE unit tested, and 3.1 and 4.0 will increase things drastically.
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop
Merge branch '2.3/develop' into 3.0/develop

Conflicts:
	system/cms/themes/pyrocms/js/scripts.js
Merge branch '3.0/develop' of git://github.com/pyrocms/pyrocms into 3.0/develop