Merge pull request #42 from jasminium/fix_yml

psutil 3.4.2 is OK, upgrading to psutil 4.1.0 via conda breaks on Mac OS X El Capitan. Install via pip is OK.

conda_env.yml

@@ -9,9 +9,9 @@ dependencies:
 - matplotlib
 - mpi4py
 - numpy
-- psutil
 - scipy
 
 - pip:
   - pyfiglet
+  - psutil