Add ruby-mode
Unset ruby-deep-indent-paren
Merge updates from master