Merge pull request #556 from jfterpstra/master

updated .gitignore