Merge branch 'feature/git-plumbing-and-porcelain' into feature/tool-web-search

# Conflicts: # src/tools.rs