New Snippet text, closes #618.

Change to the new Snippet text. Update History.md.
Fix a one off error in JRubySnippet.java.
Merge remote-tracking branch 'remotes/upstream/master'