Fix issue 97 ("^URL syntax usage in some sections does not fit the
repository layout").
* src/en/book/ch04-branching-and-merging.xml
Re-add "/calc" to the front of the appropriate URL shortcuts, and
expand one example that uses a totally different repository (for some
reason...) back out to a full URL.
