Removed ruby-head, rbx for now
Merge branch 'master' into rspec_fix