Update homebrew instructions post-merge
Rebuild documentation to fix broken links
Merge branch 'master' of github.com:fish-shell/fish-site