- Moved global gitignore to the expected location, remove explicit

Git configuration.
- Don't ignore all files, but set status.showUntrackedFiles to no, add
to post-merge hook.