info.plist and version.h ignored locally
Re-adds Info.plist and Version.h.  Use ignore=dirty in .gitmodules to avoid aggravation from build products.
Merges changes.