use https for the bookmarklet
Merge branch 'master' into heroku-edition

* master:
  use https for the bookmarklet