locale en_US
full hostname
Merge branch 'master' of github.com:sotarok/dotfiles

Conflicts:
	zsh/.zshrc