SP edits
Merge pull request #1 from sdpalley/master

From SP: Integrate Usage with acceptance of terms and place waiver clauses under terms.