Fixed a subtle bug in the metamergestrategy causing value loss on a META<->META conflict
Added testvalues for ini
Added new simple strategies for modeling the existing import strategies
Changed the threewaymerge to also merge the parentkey
Changed the import command to use the merging framework #48, #52