merge changes to constantly use Email Format 1.0 / 2.0 instead of 1 / 2; minor changes

pep-email/Makefile

@@ -32,10 +32,10 @@ $(DRAFT).xml: $(NAME).mkd \
 	examples/msg-part-decrypted-pef-2-1_compat-2-0.mkd \
 	examples/msg-part-decrypted-pef-2-1.mkd \
 	examples/pef-0.mkd \
-	examples/pef-1_old.mkd \
-	examples/pef-1-text-payload.mkd \
+	examples/pef-1-0_old.mkd \
+	examples/pef-1-0-text-payload.mkd \
 	examples/pef-2-1.mkd \
-	examples/pef-2.mkd \
+	examples/pef-2-0.mkd \
 	# ../shared/author_tags/bernie_hoeneisen.mkd \
 	# ../shared/author_tags/volker_birk.mkd \
 	#../shared/author_tags/claudio_luck.mkd \