Revert "Merge pull request #11 from todorus/feature/rails3"

Some of the tests have gone rogue, reversing.

This reverts commit 2a13c3c98915a04b0c91e1352cec10400af6338b, reversing
changes made to 634fd8feb415ba07590fc85bf69e669eb170c969.