Removed spec dependence on XmlSimple, replaced with calls to Hash.from_xml
Refactored ActiveSupport::Cache::FileStore mixin to use builtin marshalling in the base class.
Improved FauxRoutesMixin, added documentation.
Move away from using formatted_*_path routes
Update comma gem and remove from vendor/gems

Conflicts:
	Gemfile
Update rwikibot gem to be bundled with Rails 2.3

Conflicts:
	Gemfile
Remove rwikibot dependency
Update open_id_authentication plugin
Removing unnecessary #my_truncate

my_truncate is no longer needed since Rails 2.2

Conflicts:
	app/helpers/my_truncate_helper.rb
Resolve deprecation warning

require 'activesupport' => require 'active_support'
Update relative_url_root for Rails 2.3

Conflicts:
	app/controllers/application_controller.rb
	spec/controllers/application_controller_spec.rb
[gem] Add rack-openid dependency
Update tag matchers

have_tag doesn't work with Rails 2.3; use webrat's have_selector instead

Conflicts:
	spec/views/proposals/show.html.erb_spec.rb
Create the proposal model stub with a track if the event has tracks
Fix model stubs and selectors
Make schedule visible for user proposals spec
Gem-related changes to work with Rails 2.3 + manual merge of Gemfile from master branch, which corrected Bundler syntax to load correct gems and versions.

Conflicts:
	Gemfile
	config/environment.rb
Update Bundler integration
Update more rspec have_tag matchers to have_selector
Fix specs for search speakers existing record

Assign event to the proposal and adjust Proposal#find expectation to expect two
calls (one each from get_proposal_for_speaker_manager and get_speaker_matches)