Merge remote-tracking branches 'nthykier/update-gitignore', 'nthykier/cover-all-the-things' and 'nthykier/patch-1'