Update Readme & add bak/orig files to gitignore
Merge branch 'master' into develop