Pr1217 fix gitignore conflict

Unconflicts the .gitignore files by picking up the version from .master, and then adding back in the new java ignore directories.

Note that this doesn't completely solve, since after landing, we'll still need to excise the old ignore directives, but I cannot seem to do that in one fell swoop here due to the drift.