Tweaks home
Merge branch 'master' of github.com:CJNE/dot

Conflicts:
	.zshrc