Put a separator before the spreadsheets in the dropdown to make it a bit clearer of the separation.
Changed if not to unless
Formatting.
Migrate .rvmrc to .ruby-version/.ruby-gemset files

.ruby-version/.ruby-gemset are compatible across the other popular Ruby 
environment managers and has been supported in RVM for over 2 years.

Additionally, RVM will automatically setup the gemset, including the
setup/installation of Bundler.

However, it will only show the command to install a Ruby version, it
will not install it automatically. It will also not use bundler to
install everything in the Gemfile.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-636
Formatting and titles fixed.
Fix catching of YAML parsing error in Ruby 2.*

Ruby 2.* uses Psych under the hood for parsing YAML, deprecating Syck.
Now Psych throws a Psych::SyntaxError for parsing error whereas Syck
throws ArgumentError.

This also fixes test failures for #1383.

Tested:
- Ruby 1.9.3-p545
- Ruby 2.1.1-p76
- rake test:units
- rake test:functionals
- rails s
Merge pull request #1441 from zhangsu/fix_yml_error_catching

Fix catching of YAML parsing error in Ruby 2.* Fixes #1383
Merge pull request #1476 from ferrous26/rvmrc-to-ruby-version

Migrate .rvmrc to .ruby-version/.ruby-gemset files
Merge pull request #1464 from arkon94/issue-636

Put a separator before the spreadsheets in the dropdown to make it a bit... Fixes #636.

Also regenerated Gemfile.lock, so this also fixes #1480.
Recompiled Gemfile.lock