We don't have a terms of use page, so don't link to one
Merge branch 'master' into gh-pages