set language to en-us
Merge branch 'ocarina' of github.com:synthdnb/dotfiles into ocarina

Conflicts:
	zshrc
Merge branch 'ocarina' of github.com:synthdnb/dotfiles into ocarina
modify path