update .gitignore
Merge from master - 11/13