Back to directSum
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck
Merge branch 'master' of https://github.com/dlwh/puck

Conflicts:
	src/main/java/puck/parser/gen/SimpleGenRuleMultiply.java
	src/main/scala/puck/parser/CLParser.scala
fix merge problems.