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
Merge branch 'gh-pages'
Merge branch 'master' of github.com:ucsf-ckm/bookmarklet
Merge pull request #16 from ucsf-ckm/master

Merge already, will ya?