From 9624c60bd768c64044702ed3431232dd8ed34834 Mon Sep 17 00:00:00 2001
From: Craig Warren <craig_warren@me.com>
Date: Thu, 19 May 2016 17:50:15 +0100
Subject: [PATCH] psutil now seems OK to use via conda (instead of pip) on Mac
 OS X El Capitan.

---
 conda_env.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/conda_env.yml b/conda_env.yml
index 1b854fd7..7e486585 100644
--- a/conda_env.yml
+++ b/conda_env.yml
@@ -10,8 +10,6 @@ dependencies:
 - matplotlib
 - mpi4py
 - numpy
+- psutil
 - scipy
-- lxml
-
-- pip:
-  - psutil
\ No newline at end of file
+- lxml
\ No newline at end of file