Simplify Setup Docs

I made some updates to make the setup in the quickstart and standard tutorial simpler.
Then you better update the quickstart doc for consistency because that's how it is currently. My update makes both of them consistent.