Start Rails 3 upgrade
More Rails 3 upgrade progress
Finishing up Rails 3 upgrade
More Rails 3 modifications, mostly ActiveRecord stuff.
Fix lingering Rails 3 issues.
Clean up a bit
resolving merge conflicts and removed site keys
resolving issues with session creation
updated passenger and json
Remove test::unit and install rspec
merging in and resolving Gemfile.lock conflicts
added first test and rspec installed and running
verified tests
added first login integration tests
added in tests to verify user creation
cleaned up Gemfile post merge into master
cleaned up a few issues with bad merge orders