Fix badly broken .gitignore, include new scm.properties template.
I fumbled a rebase and hadn't cleaned up properly.  Including recent
changes to .gitignore from others also means that I don't need to
exempt the .properties files in this work anymore.