adding Panos' fixes
Asdasd
Asdasd
Merge branch 'master' of github.com:ucsd-progsys/liquidhaskell
misc tweaks to avoid name clashes