Final expansion, tweaks to gitignore