Move PATH vars to zshenv. Other cleanup