Merge branch 'master' into popl2012

Conflicts:
	program/ProposalMatcher.hs

diff --cc program/ProposalMatcher.hs
index 15e551d,c2a955f..e093a13
--- 1/program/ProposalMatcher.hs
--- 2/program/ProposalMatcher.hs
+++ b/program/ProposalMatcher.hs
@@@ -62,11 -52,10 +62,11 @@@ doReduction cfg (PMInstance numRvrs num
                edIdx (i, j) = i*numProps + j
                in
        let
 -              totalReviews = (reviewsEachProposal cfg) * numProps
 +              totalReviews = sum $ elems pnrA    -- (reviewsEachProposal cfg) * numProps
                totalRelativeLoad = foldl (+) 0 (map (rloadA !) [0 .. numRvrs - 1])
 -              targetLoad i = ceiling (widenInteger totalReviews * (rloadA ! i) / totalRelativeLoad)
 +              -- floor goes best with loadTolerance 2
 +              targetLoad i = floor (widenInteger totalReviews * (rloadA ! i) / totalRelativeLoad) - 1
-               -- A...H refer to idea book p.429
+               -- Edge groups A through H are indicated in the figure in the paper.
                edgesABC = do
                        i <- [0 .. numRvrs - 1]
                        let tl = targetLoad i