Add temporary files to .gitignore
Merge branch 'master' into python3