Improve aliases

- Add mt and dt for merge- and difftool, b for branchlist and more
- Fix ffunction declaration in .zshrc