Upgraded to CodeIgniter 2.1.4.
Merge branch 'master' of https://github.com/kevwu/distopia
Delete database.php
Delete database.php
Updated .gitignore.
Merge branch 'master' of https://github.com/kevwu/distopia
Merge branch 'master' of https://github.com/kevwu/distopia
Merge branch 'master' of https://github.com/kevwu/distopia
Merge branch 'master' of https://github.com/kevwu/distopia