Add orig files to gitignore
Merge branch 'master' into expandable2