Update has_many relationships for Rails 4

Remove the deprecation warnings from specifying eager loads and ordering in hash
and instead move to the new scope block syntax