Upgrade to Ruby 2.0, bump gems
Comment out dev only gem
Bundle Rake and make assets group
Merge branch 'ruby-2.0'