Simplify Gemfile and Rakefile
Allow ruby-head to fail
Merge remote-tracking branch 'upstream/master'