remove rvmrc
Merge branch 'staging'
Merge branch 'smoke' into staging
Merge branch 'smoke'
Merge branch 'staging'