small changes
Merge branch 'master' of github.com:UU-ComputerScience/uhc-utils
for ghc 7.8.2: fgl <5.5, NoMagicHash