Merge pull request #1 from doorkeeper-gem/pr/478

Reverts test-related changes
fix typos
Bring back ORM specific classes to doorkeeper