Renaming Opts to Options for consistency.
Merge branch 'master' of github.com:codegangsta/martini-contrib into cors
Adding cors middleware to the main README.
Merge pull request #120 from rakyll/cors

[cors] Add cors middleware to the main README, fix cors usage
Merge branch 'master' of github.com:rakyll/martini-contrib into oauth2