Merge branch 'master' of git://github.com/ElessarWebb/arch-config

Conflicts:
	dotfiles/.xinitrc
	dotfiles/.zshrc
Merge branch 'master' of github.com:ChocolateCookies/arch-config

Conflicts:
	dotfiles/.xinitrc
	dotfiles/.zshrc