Prefer &&/|| over and/or [skip ci]

Following section 7.3 of [Rails Guides] (http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html) .