.gitignore and fix mistake

.gitignore

+_build
+env
+*.swp

_source/index.rst

@@ -60,13 +60,10 @@ Be careful with running this command. If anything fails, your system will enter
 a broken state and anyone trying to access the platform will get mad at you.
 
 The normal update script does not include the my-passwords.yml file you created
-by running ``generate-passwords``, so be sure to include this in the
-``server-vars.yml`` file by using the ``include_vars`` attribute:
-
-Because you can't include files from vars files, it is impossible to include the
-passwords file from there. Therefore I hacked the following rules into the
-``/edx/bin/update`` script. Be sure to change ``/home/maarten/my-passwords.yml``
-to a more sensible location...
+by running ``generate-passwords``, and because you can't include files from vars
+files, it is impossible to include the passwords file from there. Therefore I
+hacked the following rules into the ``/edx/bin/update`` script. Be sure to
+change ``/home/maarten/my-passwords.yml`` to a more sensible location...
 
 .. code::