Merge Serviceable into Jeff
Clean up
Bump Excon version
Bump Jeff version