Removed extra locale files (and fixed mere conflicts)

Same as https://github.com/ernie/ransack/pull/186 but without merge conflicts.