don't need rvm
update test for intro
Merge branch 'master' into webpack