setup models for rails
merged conflicts, nothing substantive