adad
stuff compiles after shuffling things around a bit
Y U ASK
Merge branch 'master' of github.com:ucsd-progsys/liquidhaskell
stuff compiles after merge