add strategy to pretty
Merge branch 'master' of https://github.com/ptal/nominal-workbench
better design for pp + add terms and
merge