fixed Straight calculation.  Added aggregation to odds.rb.  cleaned up hand.rb conditionals