Glob now supports get and set and is properly tested
Adapted the hosts plugin to the changed glob plugin
Implemented a plugin which is able to convert from key to meta keys and back (controlled by meta data)
Adapted the augeas plugin description

Conflicts:
	src/plugins/augeas/contract.h
Update AUTHORS
Fixed compiler warnings in testmod_keytometa
Integrated GoogleTest
Started refactoring mergecode.
Reimplimented the merge algorithm
Implemented meta key comparison and cleaned up the tests
Registered the merge command, conflicts are now reported.
Wrote comments for the ThreeWayMerge functions
Fixed incorrect usage of delete
Extracted helper functions to own files and namespaces
Refactored the merger to support strategies, extracted existing functionality into a strategy and refactored
Implemented a strategy for merging metakeys and refactored
Fixed a shadow warning
Fixed a return-type warning
Improved the usability of the merge command
Fixed the merge algorithm to no longer compare parent keys and
changed the tests to avoid indexes (fragile test smell)