add locale defs in separate file
Merge branch 'master' of github.com:anders-dc/dotfiles

Conflicts:
	.bashrc