testing on 1.9.3, upgrade of rails
Merge branch 'master' into rails-3.0.12-and-ruby-1.9.3

Conflicts:
	Gemfile.lock
make valid? work on 1.9.3
Merge pull request #1 from tablexi/rails-3.0.12-and-ruby-1.9.3

Make sure everything works on ruby 1.9.3.