porting .gitignore from master
overlooked compilation errors for patches applied from 3.2