Merge branch 'master' into gh-pages
update to (hopefully) remove formatting from copy/paste text
Merge pull request #15 from Trott/gh-pages

rm formatting from copy/paste text