Updated P4Transfer with the ability to deal with +k types and merged files
from integration. The result of the latter is an 'edit from' to avoid a tamper
check problem. This is a hack for now until I can find a better way around it,
but the repercussions should be low.