Add lock files to .gitignore.
Use no-reply address in the From: field, and set a Reply-To.