added latest Rails security fixes (4.0.2/3.2.16)
fixed possible test failure
added link to JSON doc on wiki
Merge branch 'master' into gemspec
Update gemspec