generalized .gitignore
Merge remote-tracking branch 'upstream/groovy' into groovy