linking to JSONP
Merge branch 'master' into gh-pages
regenerating docs