Incorrect objects for retrieving flat and aggregated feeds

[rb512]

The methods flat and aggregated in feeds_controller, call the wrong objects: timeline_flat and timeline_aggregated to retrieve flat and aggregated feeds respectively.

These objects should be: [:flat] and [:aggregated] instead of [:timeline_flat] and [:timeline_aggregated]