rails 3 fixes
Merge branch 'rails_3'
2.0.0 release