Address several nitpicks from Marco

src/sugar/presence/Makefile.am

@@ -3,8 +3,8 @@ sugar_PYTHON =			\
 	__init__.py		\
 	activity.py		\
 	buddy.py		\
+	connectionmanager.py	\
 	sugartubeconn.py	\
 	tubeconn.py		\
-	presenceservice.py	\
-	util.py
+	presenceservice.py
 

src/sugar/presence/buddy.py

@@ -31,7 +31,7 @@ from telepathy.interfaces import CONNECTION, \
                                  CONNECTION_INTERFACE_CONTACTS
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
-from sugar.presence.util import get_connection_manager
+from sugar.presence.connectionmanager import get_connection_manager
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'

src/sugar/presence/presenceservice.py

@@ -31,7 +31,7 @@ from dbus import PROPERTIES_IFACE
 
 from sugar.presence.buddy import Buddy, Owner
 from sugar.presence.activity import Activity
-from sugar.presence.util import get_connection_manager
+from sugar.presence.connectionmanager import get_connection_manager
 
 from telepathy.interfaces import ACCOUNT, \
                                  ACCOUNT_MANAGER, \