fix merge conflicts, add .rvmrc, update views