added shortened URLs to setup / caption
Merge branch 'master' into gh-pages