Remove bad paths in gitignore
Merge branch 'master/chiba' into master/chiba2