Usamos la url https para powerline.
Fix merge conflicts.