a wee bit of capitatlization.  my wife made me do it.
Merge branch 'master' into gh-pages