compile
Merge branch 'master' of github.com:ucsd-progsys/liquidhaskell

Conflicts:
	src/Language/Haskell/Liquid/Annotate.hs
	src/Language/Haskell/Liquid/Bare.hs
	src/Language/Haskell/Liquid/Types.hs