Config edits
Merge branch 'master' of github.com:JCook21/dotfiles

Conflicts:
	.zshrc
Minor edits to config.