Move services onto new services system, includes tests

app/Contracts/Repository/ServiceRepositoryInterface.php

@@ -33,4 +33,12 @@ interface ServiceRepositoryInterface extends RepositoryInterface
      * @return \Illuminate\Support\Collection
      */
     public function getWithOptions($id = null);
+
+    /**
+     * Return a service along with its associated options and the servers relation on those options.
+     *
+     * @param  int $id
+     * @return mixed
+     */
+    public function getWithOptionServers($id);
 }