updated documentation to reflect changes that come with pgRouting v2.0
fixed merge conflicts