Winter wonderland

This release contains lots of improvements for daily work, plus a total overhaul of the merge logic.
Apart from undiscovered bugs, this version should be there for quite some time to gain further experience, and may serve as the basis for the upcoming SOS presentation.

Install via pip install sos-vcs and use the sos command on your command line.