Update and sort gitignore
Merge pull request #1709 from juancarlospaco/fix/gitignore

[gitignore] Update and sort gitignore