Reverted AsShape in favor of Rewrite
Removed nf/whnf wrapper functions
Merge branch 'master' of https://github.com/andrejbauer/tt