Before merge
merge
Personalized a bit more zsh and vim. Solved the display of tabs (it needed 2 characters)