Lots of work.
Merge remote-tracking branch 'GithubCommonplace/master'
gitignore now applied