// simplified .gitignore file
Merge pull request #1458 from djfm/1.6

// simplified .gitignore file