Merge branch 'master' of github.com:ucsd-progsys/liquid-fixpoint

Conflicts:
	src/Language/Fixpoint/Types.hs
Merge branch 'master' of github.com:panagosg7/liquid-fixpoint