Resolved merge conflict with intro.rst, continued updating examples formatting.