fixed README.rdoc => README.md
Merge branch 'master' into rails4