Reran format conversions
Merge branch 'cut10bc' of http://github.com/jlwetzel/zfcode into cut10bc