disable the circle experiment for now
merge master changes into gh-pages