Bring in .gitignore from master