Use newer rspec syntax, update rakefile for rubocop