Update CodeIgniter library to 2.1.4

Resubmission of #260 on the develop branch.

In order to maintain the cleanliness of the develop-branch version history, I cherry picked the commits from master instead of merging.