tweaks to build with GHC 7.6.2

With these two commits, gitit2 builds on current Debian experimental.