Merged master and tesseract verions of .gitignore.