Merge remote master with local master
Update rails gem to 3.2.11. Change Allow-Control-Access-Headers to include X-Requested-With and Content-Type.
In the middle of challenges...
WIP... Controller testing...
Ignore db/logfile
Merge branch 'master' of github.com:LiminalSoftware/SR-Rails-API

# By Bryan White
# Via Bryan White
* 'master' of github.com:LiminalSoftware/SR-Rails-API:
  add options verb to the routes.rb - having a problem with the before_filter :authenticate on the OPTIONS call, browser's not passing Authorization header
  modify categorizations#create to accept one request with a mod_id and category_ids array and make multiple categorizations out of it
  fix "Access-Control-Allow-Headers" not allowing "X-Requested-With" and "Content-Type"
  fix mod 'uncategotized' and 'incomplete' scopes queries. include cookies and session::cookiestore middlewares. rewrite mods_controller#uncategorized to do previous behaviour if current_user exists, execute #incomplete otherwise
Add a 'broken' route
Merge branch 'master' of github.com:LiminalSoftware/SR-Rails-API

* 'master' of github.com:LiminalSoftware/SR-Rails-API:
  Add a 'broken' route
  Ignore db/logfile
  WIP... Controller testing...
  In the middle of challenges...
  Update rails gem to 3.2.11. Change Allow-Control-Access-Headers to include X-Requested-With and Content-Type.
Fix uncategorized scope on Mods
Reworking Mod breakage (WIP)
bump to MVP