touch ups
name change
Merge branch 'master' into gh-pages