Revert "Merge pull request #390 from davehunt/fix-contact-locator"

This reverts commit bdced39421aca350ce99da89811ba93cfe4c9d36, reversing
changes made to 7812a417826597f7098e81c3f6253d8d64ffbc5c.
Merge pull request #402 from bobsilverberg/revert_locator_change

Revert "Merge pull request #390 from davehunt/fix-contact-locator"
Fixing an issue where the desktop client launches apps so fast that we miss the apploadtime event
Don't attempt to restart the b2g process if we're running on a desktop build
The test_resources unit test requires an sdcard
Adding a bluetooth manifest attribute so we can skip these tests when bluetooth is not present
Fix issue where we launch an app that is already running and displayed
Added Travis-CI configuration for the B2G desktop client (Firefox OS simulator)