added changes that from the re-tagged CodeIgniter 2.2.0 release.
Merge pull request #638 from stopfstedt/dirty_ci

added changes from the re-tagged CodeIgniter 2.2.0 release.