Merge from job branch and add orig to .gitignore