Basic cleanup and edits for ch15

Cleaned up wording and use of sections. Provided some more clarity around
the introduction and some of the cipher options.

Change-Id: I78a961c06987a8c415d248469868dd571c1484a2
Merge "Basic cleanup and edits for ch15"