remove cached files to correct .gitignore
fix merge conflicts pulling from master with new gitignore