bumped version
Cleanup the merge mess

It appears the merge has gone terribly wrong in the language department.
CodeIgniter was looking for a '_lang.php' file literally, because the
merge went bad here.
Update changelog
Merge branch 'hotfix/0.2.1' into develop