Adding some test coverage for handling HTTP OPTIONS requests.
Fixing issue #392.
Updating OPTIONS test with related issue number.
Merge pull request #393 from onlywade/master

Fixing issue #392, adding tests.