Fixed model associations so that ActiveRecord correctly maps associations.
  *See you tomorrow! :)