Sigh, restore most of the formatting changes in the last commits.

Memory served me wrong - ykneo-opengpg and monkeysphere is actually
needed to use the current hackish way of transferring the host
generated keys to the NEO (using keyParser script).