fix gitignore
Merge branch 'master' into python-alternative