Simplify gitignore
Fix typos introduced by splitting into functions.