Ruby 1.9.3 and new Routes

Currently, upgrades branch is in sync with master.

This includes updates to Factory Girl, making sure everything works on 1.9.3, and the new routes syntax.

Go ahead and look over this, but don't merge it until we get code climate set up. I want to keep track of how quality changes.