Use inline code sample in 'require' note
s/conflic/conflict/
Consistent ; use in code samples

Also, rearranged the merge code sample into two examples, rather than intertwined.
Use inline code-sampling when describing abort
Merge pull request #65 from jory/documentation-fixup

Documentation fixup