Use dist versions of all plugins
Merge branch 'master' into oja-docs
Update contributing docs