tuned yaml and dump functions to the new key format, re-generated the testkeys

tests/key-alicia-pub

@@ -1,36 +1,36 @@
 ----- BEGIN PCP PUBLIC KEY -----
-  Generated by: Pretty Curved Privacy Version 0.1.3
+  Generated by: Pretty Curved Privacy Version 0.1.4
         Cipher: CURVE25519-ED25519-SALSA20-POLY1305
          Owner: Alicia
           Mail: alicia@local
-        Key-ID: 0xD5F2E247E527F925
-    Public-Key: 1dO5d*+#bkj0vJNuNQxo&T}daphtuDw^?27XbA02z2:Lo
- Creation Time: 2013-11-10T14:24:46
-      Checksum: 51:A1:DA:B4:3C:47:6E:4B:58:8A:44:69:53:38:A3:43
-                1A:C1:C6:A1:64:89:ED:0E:AF:C7:7A:E5:C7:FB:85:EF
- Serial Number: 0xF7C8BC9E
-   Key Version: 0x00000002
+        Key-ID: 0x8F8FA41064A26DD9
+    Public-Key: 1dIyqe+FjO40}T8RN&r^u<WYb3vT7r]HvHZYQ*ov0@@r3
+ Creation Time: 2013-11-10T14:32:01
+      Checksum: 73:6E:D8:25:BB:70:0E:1A:51:26:68:89:C5:90:1A:E5
+                91:CF:92:6E:65:FE:3B:D4:D0:D9:01:10:E5:A8:C5:C2
+ Serial Number: 0x630B26D9
+   Key Version: 0x00000003
  Random Art ID: +----------------+
                 |                |
                 |                |
                 |                |
                 |                |
-                |    .   .       |
-                |     o . = .    |
-                |    o . *.=     |
-                |     . .o=..    |
+                |      . .   .   |
+                |     . . o   o  |
+                |      ..= ..  o |
+                |     .ooo=. ..  |
                 +----------------+
 
-1dO5d*+#bkj0vJNuNQxo&T}daphtuDw^?27XbA02zqh<9Otx^7nQ)i?^}@>>O7va7zVWbC]
-==4ds.SPlT3HMov}/uKjG(9PFKZ#0bxXY9ikVC1Vj=rJ2x]WB=FVbYKaI$ZqR)W$MFrUgYB
-nTZ[eMC!NPQcYtZQpVSfRMBgY>2dZAL?[rMVVKuOj+tF5=bOEpR=<@dV<Qur.h4++rU%i6O
-1^s!g0FT^3z>ls=Nvu.GxAEi%cjEK2d*^w=dN:?/!Z{b(bCuB@!U8pDs-[zxTCcjM:9=1VP
-2BR@6ZIuv)v!=FH*!vh1Xu82c?UDR]nIrYi-<OD)$AnoSJ(rlqvm^{k=vl!7&:KK+g3i6v0
-CrEd$2E>Y{>.9vt](x^P}q(bf&em34)TYgBacIl4oA8n6vqGT/x<<nyz!0i(0oH+e*@g3/-
-GE(M[rzo4-{cl9^uI7uH-rIt4jB+/]&AcFa*qn}s-W/AA*h(bI9=:wjjA{N()UPzE755CCa
--qNUY4j?3%yo+-k^<5f<Ta%vcxO?}bX0T&wG89]JaTaFe&njD^(tU5G4N}tpf>$zUOv>G2E
-]Ls})!aN47]1tg=>$N)+=4TrMAicEk)bS5ARyrD6[oIwc6:?^^kNMwE[sMAI^k7ZM[P0Ru0
-m:})s*:3)=.XTGv22aW-04j?-.evZd%j:gd8n$hQPRstGfr^S+)^2s(?S[AR7.zBP7[>]18
-rQ{C3/oEZKhaxt&gbH{Uh8m9WiwJC(aohxw08!r69SMfu0@6^GO=!+-*en&SNdU3QP<ipTQ
-er*oE#7r@u34s@tdu+%r6aR+FN5{$JL3ppBGaL^t+0oKC[w#mY[erBP$M1A3&*nc
+1dIyqe+FjO40}T8RN&r^u<WYb3vT7r]HvHZYQ*ov0#ojN=YF47yCVVdFS%L>jyQ&Pe#Uqg6
+B-%wS-KXGHcYS&v}/uKpuWY.&P5qRm0AYLFW@S(h^C@cp545<r]rHQKsMwWYSid8tEIo[g#
+SzrX%3r<Lmtc7XIw=%3sM55&g2xrgee6Elsjmp}7gnMY(p=q}at.YH3J2net:LDmAS:OeH@
+ip7+eCA9)s:8X.UB1M^3uzCY4WgkNp#x4x[iEvf#%(J2Ud^eq{BAO&j>=hq@3zfNA5jNjIx
+HCNQlDrewiacrQs4ytf$8p:l-jby*Ul^j2rk?^qQ7@Ck@c5J5mtzpP0TP(1R2eKT8W.LGuy
+4/hYs]ayI%o6QQp!OtLVNjdj#ia]2AbC0GHjZ>/nSsnV0vqGT/x<<nyz!0i(0r4W7.Ci4Py
+?}=L6OncmH%VP*{VYOF<wV6W8sQQdz.6-?AuT-{8s3<Fr*yqfgL>o.p-u^{/]H&rJ)}ch72
+!kQtc):/I6+tF-geqP)H8]*-b<#GC[bm}CsBLSf^1mX.fTM-8g$YM]BRO3/x2ErJ<p1AMXy
+5fCV[4Dhv#Q>4=^INv3pSmJ[>iYH1n/Upaz[7OeB.z{X]N]Ok/<NgLIV)m!%(<LT.2S&uGi
+M?m2x^Y<twez>PDW:6f$(<M0>}faF}2xSk6U?#yhEm9#/I&36AuD+pVgwC[muk/Cv:s/7$y
+By&x1K0Q$?mMr>6g+*Wxg^J(Pl{%3nEGfuF08!r7^eTdD17IY=/-P<^<9-Q4{Wgx:-)+QP&
+0j[DSOa[-*W-4-rwqq2OKXQ{3L5#:yhbD*(*BHgP+WGsr-DZRVV#l!Ddg[!I2WIQ
 ------ END PCP PUBLICKEY ------