Cleaned up "How to keep up to date" section

Merged in the (little) extra info contained in the pages "Gitrebasefeaturebranch.rst" and "Gitkeepingpace.rst", which I intend to delete.