Update copyright notice through 2014.
A couple prose edits.
Merge branch 'master' into gh-pages

* master:
  A couple prose edits.
  Update copyright notice through 2014.