Merge "Remove old build options from .gitignore"