Merge branch 'fish' into local-develop
Merge branch 'gentoo-inherit-fix' into local-develop
Merge branch 'better-errors' into local-develop
Merge branch 'powerline-lint-fix' into local-develop
Merge branch 'zsh-vi-mode' into local-develop
Merge branch 'zsh-vi-mode' into local-develop