cleaning up .gitignore
Merge branch 'master' into pypy