Edit .gitignore
Update for 1.7.10-pre4.

Everything appears to work..
Merge remote-tracking branch 'upstream/master' into pm_tweaks