Use a .com domain that belongs to us for localhost resolution.

Enough of dealing with funny domains like smackaho.st and lvh.me
run by third parties.
(cherry picked from commit 9f83156bc7bf55351e24bf902fe28d5baa195266)

Conflicts:
	features/step_definitions/setup_steps.rb
Upgrade to Rails 3.0.19.
Upgrade selenium-webdriver to work with Firefox 17.
Prep for version 1.3.2.
Merge branch 'release-1.3.2' into v1.x

Conflicts:
	Gemfile
	Gemfile.lock
	features/step_definitions/setup_steps.rb
wip
Merge branch 'v1.x'

Conflicts:
	Gemfile
	Gemfile.lock
	lib/one_click_orgs/version.rb
Upgrade to Rails 3.2.11.
Merge branch 'master' into coop

Conflicts:
	Gemfile
	Gemfile.lock