Revised many MCQ/TF questions, combined some summaries, and updated configuration files and RST files to match
Fix Makefile merge