Revert "Revert "Merge pull request #300 from jpcody/master""

This reverts commit 9b92af7098b2728ced578ab9a7679176d20f120f.

beta2 is out, and we've fixed the issue that this caused in Rails