Add required author acknowledgement for the Entypo font and fix errors from merge