Upgrade to Rails 3

I can't seem to get Machinist 2 to work properly. I think I'll just use Factory Girl instead.

(from [d54de7ecfa3722d1f27e57bdc6669fbac741038d]) rake rails:upgrade:configuration [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/d54de7ecfa3722d1f27e57bdc6...

(from [2b6237f4c130e426313d20c2653c6461e51145f1]) Deal with deprecation warnings prior to upgrading Rails. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/2b6237f4c130e426313d20c265...

(from [7ff76b4efb116391682cc900952361f288ea6497]) Require explicitly now that autoload rules have changed. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/7ff76b4efb116391682cc90095...

(from [fc7999d7699fdf3e7927b21fcef9ba6f583f53b1]) Remove javascript_test plugin. It's causing problems and I wasn't actually using it. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/fc7999d7699fdf3e7927b21fce...

(from [fdc71f4ccf2ec388b306941fa871a226feac22da]) Flip the switch for Rails 3. NOT ALL TESTS PASSING YET! [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/fdc71f4ccf2ec388b306941fa8...

(from [b89e509ff840f252a46a846bd9051256e00ea7f5]) Fix a couple of broken requires. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/b89e509ff840f252a46a846bd9...

(from [7a5eab74b6542ca001f15337a6c63f6720fde8fc]) Remove more deprecated syntax. (Of course, these controller specs should go away anyway.) [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/7a5eab74b6542ca001f15337a6...

(from [dae3b56d325c0b4938397d0ced935c89401457ea]) Move config stuff around so it doesn't block Rails startup. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/dae3b56d325c0b4938397d0ced...

(from [4534a11a7a0b662fa5ccb5ab6812cc6c9609b731]) Remove outdated method. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/4534a11a7a0b662fa5ccb5ab68...

(from [53cf2527d4e1181a4f73477ea71f0a8b5d43077e]) Move RSpec options file to new location. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/53cf2527d4e1181a4f73477ea7...

(from [35cade0f543aeba072e9ea7892c105372a904bfd]) Fix root mapping. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/35cade0f543aeba072e9ea7892...

(from [a1db0d46ba4cc0285e7a9dd005faacf220661ecb]) Upgrade Machinist. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/a1db0d46ba4cc0285e7a9dd005...

(from [5abf58c53c94376fd91debb5ecc24c95c1139990]) Refactor RSpec config into support files. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/5abf58c53c94376fd91debb5ec...

(from [13a4e0017fade26e44c40de6aca2c702b47cefb3]) Fix image URLs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/13a4e0017fade26e44c40de6ac...

(from [b02efbbb5afce8295bdd111f4d9adadc27c5adc2]) Use gettext_i18n_rails gem instead of plugin. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/b02efbbb5afce8295bdd111f4d...

(from [d86a872d9c3dbd99eb07ad7b5550d0deb5eba304]) Replace Machinist with Factory Girl. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/d86a872d9c3dbd99eb07ad7b55...

(from [3043d7347ebc082efaf53717db0d8c45171e2315]) Get rid of shams. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/3043d7347ebc082efaf53717db...

(from [98fbf2526a6be66863cb7b20659755f9df1f7ce5]) rails g rspec:install [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/98fbf2526a6be66863cb7b2065...

(from [99a887e503f430e8b30da83fe6d8e1f3bdf7e697]) Install rails_upgrade plugin. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/99a887e503f430e8b30da83fe6...

(from [f5c447f374f90bcef6fa56cb4adb246410e6888e]) Start fixing views for Rails 3. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/f5c447f374f90bcef6fa56cb4a...

(from [0c5531d562431a92f5202882cca803247fd246c5]) rake rails:upgrade:routes [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/0c5531d562431a92f5202882cc...

(from [48930a29b300333bcc7bb1ed316518592d440bf5]) rails new . [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/48930a29b300333bcc7bb1ed31...

(from [24b28ace34fa275d135a5bf88d5063e38591b6ff]) Update options syntax. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/24b28ace34fa275d135a5bf88d...

(from [81151f9e3cfc156736ba6b3abff8da9163e4596d]) Remove Machinist init file. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/81151f9e3cfc156736ba6b3abf...

(from [e86eec4b2dd605c71137a5d3ee5df6bd616ef254]) Configure generators. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/e86eec4b2dd605c71137a5d3ee...

(from [9ec2f1f02a617f312a6d7b0921c1bac5086e68ed]) Use Bundler in Autotest. [#52 Upgrade to Rails 3][#53 Use RVM and Bundler] https://github.com/marnen/quorum2/commit/9ec2f1f02a617f312a6d7b0921...

(from [4d03c223b06c00c89eba648a694ad64039a5f5b1]) Update shared example syntax. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/4d03c223b06c00c89eba648a69...

(from [8689ebe5b25504345229e12852d1f3e1570b0ea3]) Fix Gettext. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/8689ebe5b25504345229e12852...

(from [13811822f06a727701f3d68be25e61dfc4d7b7f1]) Finish setting up FastGettext. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/13811822f06a727701f3d68be2...

(from [9f5b6c2ea12cc7106d7b96e41e1771588953875b]) Translate blueprints to FactoryGirl syntax. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/9f5b6c2ea12cc7106d7b96e41e...

(from [a8e84ec536071d9281c927766abb570e56de8702]) Enable Authlogic for view specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/a8e84ec536071d9281c927766a...

(from [23af39f008f7190c4c9773d738294d7719b62bc6]) Normalize spec_helper requires as recommended at https://github.com/rspec/rspec-rails/issues/371 . [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/23af39f008f7190c4c9773d738...

(from [89ca114c5c8eb713af00e3678069aaa611f40155]) Initialize fast_gettext for specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/89ca114c5c8eb713af00e36780...

(from [5f64dfd05f1f7c2698f28692076a6b0cbced79f5]) Move blueprints to factories file. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/5f64dfd05f1f7c2698f2869207...

(from [d8a04fca5d6ca869bf795be63e9b5f0060e6d9c5]) Continue updating views. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/d8a04fca5d6ca869bf795be63e...

(from [d094df8fe9603913fe1da61854856fb1d6a52f08]) Update spec for RSpec 2. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/d094df8fe9603913fe1da61854...

(from [195e2c95be23eab8f0a083b5f345e007e08b68f8]) Translate all specs (except acts_as_addressed) to Factory Girl. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/195e2c95be23eab8f0a083b5f3...

(from [f464730f7f5170ca74e341d5602d08e2cc02699c]) Change RSS feed to Haml to make Markdown easier. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/f464730f7f5170ca74e341d560...

(from [f7a5c231cf5828889a39d06c2e5bf765e1b08473]) Install Prarupa so we can have Markdown helper easily. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/f7a5c231cf5828889a39d06c2e...

(from [9f2d9edf3b311d2dd85888b923e73ec6ac4850c3]) Looks like we don't need Prarupa now that we're not using the markdown() view helper. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/9f2d9edf3b311d2dd85888b923...

(from [0e3d4f37faa9d6a217a8cc98717fcdb9fd8a908a]) Fix feed formatting and update specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/0e3d4f37faa9d6a217a8cc9871...

(from [6258c82c2a91aa54a33bd00bcec1e9cb32f56dd0]) Refactor specs to new style. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/6258c82c2a91aa54a33bd00bce...

(from [b48a0a060a9cd7bc01a497a60bfe2e9fa5a6f286]) Fix expectation. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/b48a0a060a9cd7bc01a497a60b...

(from [e6599beb6a01ba412ce2a0676452a8d7e023b30e]) Default to showing users in reports. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/e6599beb6a01ba412ce2a06764...

(from [fa5ac3d0c7cea8cd55d1456ac45b690564a04088]) Fix factory. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/fa5ac3d0c7cea8cd55d1456ac4...

(from [ac30e95cdd6395ab4c18c7db7b60b0a0d1a41ffc]) Fix a failing spec. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/ac30e95cdd6395ab4c18c7db7b...

(from [41ba0164d51e514e078642d3f514a5837f3a9777]) Refactor and fix failing Prawn specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/41ba0164d51e514e078642d3f5...

(from [1e087e59be98888d049ef03a0a6db46ce0d494fa]) A bit of nil-safety. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/1e087e59be98888d049ef03a0a...

(from [fa52b5e0dae2677dfafe5c794d9044648d6d4d11]) Fix XHR spec. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/fa52b5e0dae2677dfafe5c794d...

(from [98195c0e5ad3a7f417e8a4c3fbd560653ac3a8e9]) Fix failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/98195c0e5ad3a7f417e8a4c3fb...

(from [3d1282a882e74e1c9dd233e3dffaaedce63590a2]) Use instance variable instead of class variable. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/3d1282a882e74e1c9dd233e3df...

(from [8e7b359d42a8f7d33bb30f9a0d6d05de7e5c40e0]) Fix and refactor more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/8e7b359d42a8f7d33bb30f9a0d...

(from [df165b620ec6444d63ea3ffa0220542c1cb22b51]) Fix more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/df165b620ec6444d63ea3ffa02...

(from [71a87ceb1a6bdd67296b676fe230b770222d1bc5]) Fix a failing spec. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/71a87ceb1a6bdd67296b676fe2...

(from [30431de0e27f4d05c352ac80b5fb146c6f6bd26c]) Fix failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/30431de0e27f4d05c352ac80b5...

(from [ada67f4f92ec3b167c52fb4c958aba873b2865b9]) Fix a failing spec. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/ada67f4f92ec3b167c52fb4c95...

(from [e0763ccf0cedfb5eba217826630b78086c37e0e3]) Mark a broken spec as pending. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/e0763ccf0cedfb5eba21782663...

(from [c1bd54c6cff6507bf14e229c161b7458969ccfea]) Fix HTML escaping. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/c1bd54c6cff6507bf14e229c16...

(from [a854253675beffb6c8c1c1a43904e3154c6f1261]) Fix some particularly ugly specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/a854253675beffb6c8c1c1a439...

(from [70927835e2bdfafee21acf1475792166a67be4cb]) Remove redundant Autotest installation. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/70927835e2bdfafee21acf1475...

(from [62a654c3af6c5e5c3f1271f54825698350da312a]) Fix feed syntax, and configure Haml to output both HTML5 and XML. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/62a654c3af6c5e5c3f1271f548...

(from [8d62110390a0fdeda15580b7093e88f151e19fde]) Fix failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/8d62110390a0fdeda15580b709...

(from [126a03f6b53038d95d76a8a43c9514970cea1b89]) Fix failing spec. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/126a03f6b53038d95d76a8a43c...

(from [1e7a7a9bb2d69e42231a98725fe879f2b5a222b5]) Fix failing specs and escaping. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/1e7a7a9bb2d69e42231a98725f...

(from [57594cef4d0830a2ed0081791d87a8d87f8fb98d]) Update for new syntax. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/57594cef4d0830a2ed0081791d...

(from [9b363049a29d8e2bc978526074ff227546a2d1b2]) Fix failing specs and rewrite to use factories, not mocks. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/9b363049a29d8e2bc978526074...

(from [edeaa02f48eb8b04f4cdca9556ef2cbe247bf703]) Fix and refactor more specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/edeaa02f48eb8b04f4cdca9556...

(from [6f0fba2370de256a5e03699c3b75ab4d96d0f391]) Fix more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/6f0fba2370de256a5e03699c3b...

(from [d4363191116833dd28ac2a093ea6f19c6b647251]) Fix failing steps. [#52 Upgrade to Rails 3] ALL SCENARIOS AND SPECS PASS! https://github.com/marnen/quorum2/commit/d4363191116833dd28ac2a093e...

(from [91853d00d9bb81423c8c9e5abe5b983f1ceac7ad]) Fix more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/91853d00d9bb81423c8c9e5abe...

(from [207602c336d29ecca4616e48823e9703bd85eba8]) Fix a few brittle specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/207602c336d29ecca4616e4882...

(from [93d800fdc2440925d094bdad7258a3391d8365ff]) Get Cucumber running. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/93d800fdc2440925d094bdad72...

(from [d39541d520d6c17cc84b4dfa1782df7e8ed56fbf]) Fix yet more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/d39541d520d6c17cc84b4dfa17...

(from [efc20f0ea5f39ec51f9a54ccbe292bdc1800554a]) Fix more failing specs. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/efc20f0ea5f39ec51f9a54ccbe...

(from [2cddb070c20e4583efd950372a9d6fb49023e84e]) Rename spec file with obsolete name. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/2cddb070c20e4583efd950372a...

(from [999f3518a933558207cea6b90e49056f9efc46c0]) Initialize Gettext in the Rakefile. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/999f3518a933558207cea6b90e...

(from [7c7cf3f8b8aa1d8c03b8a9c160e3d9de19c03435]) Deal with last failing specs. ALL SPECS PASSING OR PENDING! [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/7c7cf3f8b8aa1d8c03b8a9c160...

(from [9482a067bf2a5949faaea864c08af369c7e5b803]) Fix a couple of deprecations. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/9482a067bf2a5949faaea864c0...

(from [97591398700c5d57e462a1d913479d3154afe623]) Commit neglected file. [#52 Upgrade to Rails 3] https://github.com/marnen/quorum2/commit/97591398700c5d57e462a1d913...