Remove n+1 query
Bump rails to 3.2.18