Updated merge tutorial with requested changes and fixes to the examples.
Fixed typos
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
elektra-merge-integration document
Remove part about umount
Write example text and fix last commit
Fix typos
Spelling mistakes and updated
Changed commands
Included original version of inih in a properly named folder (won't build with this version) #55
Applied required patches to inih #55
Added the LICENSE of inih
move va_list handling of keyVNew to keyVInit

This is needed by language bindings, which splits object construction and
initialization. In particular GObject.
Renamed inih files to avoid conflicts and added it to the include path
Improved the help text of import
Fixed a merge conflict presentation bug