Manual merge of fix point and linear/new-stuff

Not Ready to Merge
--------------------------

This type checks and includes all of the work @byorgey  did
on fixpoint. This should replace the fixpoint branch but please
don't delete fixpoint yet as it may have valuable comments that I 
missed.

What to do next?