remove vendor
test immediate
Merge branch 'master' into gh-pages