Feature/rails4 fix specs

Fixes all spec failures when running ```rspec spec/models```