Overhaul Git workflow

• Merge Git Help into introduction
• Delete merge review page and link to review shiter guide instead
• Move Pseudo-merge and SVN instructions to "Archived"
• Move the conflict resolution topic out of the tutorial
• Restructure navigation