Add OPTIONS to the list of convenience methods in the test client
add TRACE method
Merge pull request #381 from kevinburke/options

Options