Merge pull request #2 from EllisLab/develop

Develop
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Merge branch 'develop' of https://github.com/williamknauss/CodeIgniter into develop