Merge branch 'master' into customizations

Conflicts:
	modules/git/alias.zsh
	modules/rails/init.zsh
	runcoms/zpreztorc
	runcoms/zshrc