add .directory file -- per-directory view settings on linux -- to gitignore
Merge pull request #1801 from toddrjen/master

Add .directory files to .gitignore
Merge remote branch 'matplotlib/master'