Clean-up, re-add .gitignore