Rejigger .gitignore
Merge branch 'master' into convey
more rejigger