Flex report: fix bug

when selecting specific allocations
Update trips: bug fix

remove order by that Rails 4.0 adds to queries