Add Rails and QA
Merge branch 'master' into gh-pages