add utf8 support.
Merge branch 'master' of github.com:riethmayer/dotfiles

Conflicts:
	bash/env