add rvmrc, gemfile, scripts dir. move scripts
updated readme
resolve merge conflict