Update rails to 4rc1
Filter out associations not part of aggregate