example data option for web; fixed py testing
Merge branch 'master' into gh-pages