Make the tests pass after merging upstream/master

A bit has changed - mostly adding the ServiceWatcher class in the
hierarchy.

safe_yaml needs upgraded because of:
dtao/safe_yaml#67

Gemfile.lock

@@ -60,7 +60,7 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
     slop (3.4.6)
     spoon (0.0.4)
       ffi

lib/synapse/service_watcher/marathon.rb

@@ -1,8 +1,8 @@
-require "synapse/service_watcher/base"
+require 'synapse/service_watcher/base'
 require 'json'
 require 'resolv'
 
-module Synapse
+class Synapse::ServiceWatcher
   class MarathonWatcher < BaseWatcher
     def start
       @check_interval = @discovery['check_interval'] || 10.0

spec/lib/synapse/service_watcher_marathon_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
+require 'synapse/service_watcher/marathon'
 
-describe Synapse::MarathonWatcher do
+describe Synapse::ServiceWatcher::MarathonWatcher do
   let(:mocksynapse) { double() }
   let(:marathon_host) { '127.0.0.1' }
   let(:marathon_port) { '8080' }
@@ -21,7 +22,7 @@
   end
   let(:marathon_response) { { 'tasks' => [] } }
 
-  subject { Synapse::MarathonWatcher.new(config, mocksynapse) }
+  subject { described_class.new(config, mocksynapse) }
 
   before do
     allow(subject.log).to receive(:warn)
@@ -38,7 +39,7 @@
 
   context 'with a valid argument hash' do
     it 'instantiates' do
-      expect(subject).to be_a(Synapse::MarathonWatcher)
+      expect(subject).to be_a(Synapse::ServiceWatcher::MarathonWatcher)
     end
   end