add locale settings in zshrc
Merge branch 'master' of github.com:georgehrke/dotfiles

Conflicts:
	.zshrc