Multi-user ability

implements #46
Finish conversion to merge startegy
git ship with message
Mention pruning explicitely
Fix git hack
Fix quotation, add step