updating links
wording change
Merge branch 'master' into gh-pages