Updated README.
Merge branch 'master' into rails-four.