Add non-.rb ruby-mode file extensions
Merge master
Word change to match master that wasn't pulled across due to conflict