      compilers: [:phoenix, :gettext] ++ Mix.compilers,
      build_embedded: Mix.env == :prod,
      start_permanent: Mix.env == :prod,
+<<<<<<< HEAD
      aliases: aliases(),
      deps: deps(),
      preferred_cli_env: [espec: :test]]
+=======
+    #  aliases: aliases(),
+     deps: deps ]#,
+    #  preferred_cli_env: [espec: :test]]
+>>>>>>> 4cce494... WIP tests from umbrella
   end
 
   # Configuration for the OTP application.

      "spec": ["ecto.create --quiet", "ecto.migrate", "espec"],
      "ecto.reset": ["ecto.drop", "ecto.setup"],
      "test": ["ecto.create --quiet", "ecto.migrate", "test"]
    ]
  end
end

  #
  #     $ mix ecto.setup
  #
<<<<<<< HEAD
  # See the documentation for `Mix` for more info on aliases.
  defp aliases do
    [
