Code cleanup
Merge branch 'develop' of github.com:kakysha/CodeIgniter into develop