Update rc
Merge remote-tracking branch 'origin/archlinux' into archlinux

Conflicts:
	.zshrc