Further improve locale.
Merge branch 'master' of https://github.com/bond/dotfiles
Remove double case-statement from previous merge