merged with github/gitignore take two