change model associations to support rails 3.2