fix a/an grammar in obvious cases

Apply our local changes bringing us up to 3.95 (for which there is no
release tar), and add build glue.