Remove unnecessary defined('ENVIRONMENT') checks

As suggested in issue #2134 & PR #2149
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop