* Trying again, without gtk_doc dependency on dbus_glib

* Re-added six, taking a minimal approach to fixing it this time.