Organize gitignore.

- sort alphabetically
- remove the <<<<<<< HEAD merge artifact
Merge pull request #391 from cirosantilli/organize-gitignore

Organize gitignore.