rails4 ready
Merge pull request #1 from mikey0000/rails4

rails4 ready