Merge branch 'scratch' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler