Add WattsUpReader to util.py
Some cleanup on conway stuff
Merge branch 'master' of https://github.com/ucb-sejits/ctree