Revert "Split out fzfz and path settings"

This reverts commit 6ca78f08d4e6b194bcf90c17d3f476c28cb3dc97.

Conflicts:
	zshrc