Add sql heredoc highlighting to ruby
Use mysql instead
Merge remote-tracking branch 'upstream/master'