Another SVN update

This has been a slow week, the whole family has come down with the flu and I haven't been able to do that much.

I've come a bit further though and now the code in the SVN repo has a working execution environment and conflict resolver. There are still a lot of things to add and work out but it really feels as if the pieces are starting to fall into place.