export LANGUAGE in zshrc
Merge branch 'master' of github.com:jokeyrhyme/dotfiles

Conflicts:
	zshrc