Seteo tabs a 4 espacios.
Solved conflicts.
Merge branch 'master' of github.com:sldenazis/vim