Fix for NameError: uninitialized constant HelpersTest::JSON
Reorder Sinatra::Base.
Merge pull request #703 from viliampucik/master

Fix for NameError: uninitialized constant HelpersTest::JSON
Merge pull request #704 from patriciomacadden/reorder

Reorder Sinatra::Base's metaclass
Correct some typos
Merge pull request #707 from patriciomacadden/typo

Correct some typos
revert part of f069b53
revert more of f069b53