asdasd
ugh bugs
 asd
  Merge branch 'master' of https://github.com/ucsd-progsys/liquidhaskell
ES fix breaks something pretty serious. IMO
manual merge
merging with @gridaphobe 's fix for #239