Fix merge with spaces + reorganize aliases
Fix merge with spaces + reorganize aliases

OlivierBlanvillain/dotfiles,OlivierBlanvillain/dotfiles,OlivierBlanvillain/dotfiles,OlivierBlanvillain/dotfiles,OlivierBlanvillain/dotfiles,OlivierBlanvillain/dotfiles