Add initial work on unification in desugarer
Merge branch 'unify' into unify-ds

Conflicts:
	sugar/Desugar.hs
Initial work on desugaring with type inference