Merge gitignore from new-template branch