Move env vars to zshenv
Cleaned up some section markers and added some settings