Fix failing tests in desktopcouch

I'm fixing some of the spurious failures now, these two remain:
===============================================================================
[FAIL]: desktopcouch.tests.test_local_files.TestLocalFiles.test_file_locations

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 175, in run
    testMethod()
  File "/home/emurphy/canonical/ubuntuone/shared/desktopcouch/trunk/desktopcouch/tests/test_local_files.py", line 23, in test_file_locations
    self.assertEqual(flatpidfile, desktopcouch.local_files.FILE_PID)
exceptions.AssertionError: '/home/emurphy/canonical/ubuntuone/shared/tmp/desktop-couchdb.pid' != '/home/emurphy/.cache/desktop-couch/desktop-couchdb.pid'
===============================================================================
[ERROR]: desktopcouch.records.tests.test_field_registry.TestFieldMapping.test_mergeable_list_field_mapping

Traceback (most recent call last):
Failure: twisted.trial.util.DirtyReactorAggregateError: Reactor was unclean.
DelayedCalls: (set twisted.internet.base.DelayedCall.debug = True to debug)
<DelayedCall 178046060 [0.991724014282s] called=0 cancelled=0 LoopingCall<1.0>(exit_on_success, *(), **{})()>
<DelayedCall 178045868 [2.14146709442s] called=0 cancelled=0 reconnector()>
<DelayedCall 178031340 [28.9916679859s] called=0 cancelled=0 exit_on_timeout()>
-------------------------------------------------------------------------------