ported objmodel.cpp to use rewriter2 exclusively, deprecates rewriter1
removed rewriter1
fixed a bunch of bugs
got rid of 2s
Merge pull request #113 from tjhance/rewriter2

Rewriter2