Update README instructions with proper git merge conventions

Signed-off-by: Steven Esser <sesser@nexb.com>

Author: steven-esser

README.rst

@@ -26,6 +26,6 @@ Update an existing project
     cd my-existing-project
     git remote add skeleton git@github.com:nexB/skeleton
     git fetch skeleton
-    git merge skeleton --allow-unrelated-histories
+    git merge skeleton/main --allow-unrelated-histories
 
-This is also the workflow to use when updating the skeleton files in any given repository.
+This is also the workflow to use when updating the skeleton files in any given repository.

setup.cfg

@@ -25,7 +25,7 @@ packages=find:
 include_package_data = true
 zip_safe = false
 install_requires =
-setup_requires = setuptools_scm[toml] >= 4
+setup_requires = setuptools_scm >= 4
 
 [options.packages.find]
 where=src