Merge "Add gen/ to .gitignore"