Simplified merge functionality, default to merge-strategy "ours".
Organized branches/tags functions.
Updated readme.txt