fix typo: PattronCualquieraMenos should be PatronCualquieraMenos
Merge pull request #810 from patriciomacadden/typo

fix typo: PattronCualquieraMenos should be PatronCualquieraMenos
Updated "Further Reading"
Merge pull request #811 from wuleicanada/patch-1

Updated "Further Reading"
Translation improvements
Merge pull request #812 from wuleicanada/patch-2

Translation improvements
Remove charset from JSON mime-type

The IETF RFC establishes that the charset parameter on the JSON
mime-type is not a required or an optional parameter.

Reference: http://www.ietf.org/rfc/rfc4627.txt
Merge pull request #813 from sborrazas/json-mime-type

Remove charset from JSON mime-type
Add license to gemspec

Although the repo carries a license, the spec does not list it.
Fixes #816
Merge pull request #817 from kgrz/master

Add license to gem spec. Fixes #816
Capitalization, grammar, and pluralization fixes. [CI skip]

Just a few fixes to improve consistency and readability. I also want to point out that 'lock' under 'Available Settings' (line 2048) is difficult to understand and should probably be reworded. I was unable to understand the author's intention, or I would have done it myself.
Merge pull request #818 from fluxusfrequency/patch-1

Capitalization, grammar, and pluralization fixes. [ci skip]
Add Ruby 2.1.0 to .travis.yml
Merge pull request #822 from salimane/pr_ruby_2_1_0

Add Ruby 2.1.0 to .travis.yml
drop some rubies
reduce number of template languages tested on 1.8, most of them do not support it anymore or will drop support soon
Not `showexceptions` but `show_exceptions`.
Merge pull request #823 from namusyaka/fix-incorrect-regexp

Not `showexceptions` but `show_exceptions`.
Fix JRuby's incorrect behavior when using utf-8 method name.
Merge pull request #824 from namusyaka/patch-jruby

Fix JRuby's incorrect behavior when using utf-8 method name.