remove rvmrc
Merge branch 'staging'