Add cairo and diagrams-cairo (fixes #101)