Merge branch 'master' into iridium

Conflicts:
	.Xresources
	.zshrc
.vimrc modifications
Merge branch 'master' into iridium
Wifi script changes
Turn off LatexBox folding
Merge branch 'iridium' of github.com:Indiv0/dotfiles into iridium

Conflicts:
	.Xresources
	.vimrc
	.zshrc
	etc/wpa_supplicant/wpa_supplicant.conf
Create etc/