updated to remove setuptools line conflict error
added instructions for configuring git.