Open .jbuilder files in ruby-mode
C-M-h is more useful as mark-defun
Minor rewording
Merge remote-tracking branch 'upstream/master'