Fixed conflict in .rvmrc file.
Updated bundle.
Fixed .rvrmc conflict.
Updated bundle.
Merge branch 'master' into staging