initial refactoring to make this work with rails ~>3.1.0.rc
Modify activesupport/activemodel dependencies
Merge rails31 into master
Require adapters