Merge tagging - V1

I am ready to call this finished for V1.
Please see the sub-task list at #514 to see what is implemented.