Update to rails 3.0.4 and composite_primary_keys 3.1.1