Remove .rvmrc
Remove *.swp from .gitignore (Use ~/.gitignore_global instead)
Remove Gemfile.lock
Add .ruby-version
We don't support ruby-1.8.7 anymore
Add Gemfile.lock to .gitignore
Merge branch 'edge'