Pull request #3379 without .gitignore

@fratnikov's pull request #3379 deletes .gitignore which shouldn't be part of the PR.
Since I can only merge entire pull requests I've taken his and added the old .gitignore back in.