More obvious conditionals in Gemfile
Use Arel master when using ActiveRecord master
Fix typo