add .rvmrc: ruby 2
replace .rvm with .ruby-gemset and .ruby-version
update gitignore (w/ github version)
merge master