gitignore updates
Merge remote-tracking branch 'origin/gitignore'