Git am's hard. Cleaning up .gitignore stuff. Again.