Merge branch 'skratchdot_extras' into gh-pages
rebuilding docs