Refactor spec_helper a bit.

Conflicts:
	spec/spec_helper.rb
Add rack session middleware.
Merge pull request #3 from fotoapp/update-test-harness

Update test harness
Merge branch 'master' into add-s3-to-user

* master:
  Add rack session middleware.
  Refactor spec_helper a bit.

Conflicts:
	spec/spec_helper.rb