Added Rails integration
Cleanup