Update to latest upstream, and also update readme.

Thanks for the Rails 4.1 fix.