Merge pull request #16 from sourcegraph/graph-with-haddock-pr

Use a forked version of haddock for graphing.
Cleanup.