porting .gitignore from master