bugfix in ORG field

Fixed a bug that was causing the organization to be split into
one-character fields.  At the same time, added the program/plan as a
department of the org.
Merge branch 'master' of https://github.com/leingang/ps2vcard