From b4e7a465243210816bb84d307930226e4f5db02d Mon Sep 17 00:00:00 2001
From: Ryan May <rmay31@gmail.com>
Date: Mon, 6 Jul 2015 11:39:21 -0500
Subject: [PATCH 1/3] Add conda environment config. (Fixes #40)

---
 environment.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 environment.yml

diff --git a/environment.yml b/environment.yml
new file mode 100755
index 000000000..192c491c6
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,19 @@
+# Create full conda environment for development, including some useful tools
+name: devel
+channels:
+  - https://conda.binstar.org/Unidata
+dependencies:
+  - python=3
+  - numpy
+  - scipy
+  - matplotlib
+  - pint
+  - requests
+  - protobuf
+  - netcdf4
+  - ipython-notebook
+  - sphinx
+  - nose
+  - vcrpy
+  - flake8
+  - pep8-naming

From a1c7e0f0efb59d8aa5b5a2842d26909049bddaa2 Mon Sep 17 00:00:00 2001
From: Ryan May <rmay31@gmail.com>
Date: Mon, 6 Jul 2015 11:44:21 -0500
Subject: [PATCH 2/3] Update developer guide with conda environment setup.

---
 docs/source/developerguide.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/source/developerguide.rst b/docs/source/developerguide.rst
index 94cec69c1..0e368c37a 100644
--- a/docs/source/developerguide.rst
+++ b/docs/source/developerguide.rst
@@ -13,6 +13,21 @@ Requirements
 - IPython >= 3.1
 - pandoc (not a python package)
 
+~~~~~
+Conda
+~~~~~
+
+Settings up a development environment in Siphon is as easy as (from the
+base of the repository):
+
+.. parsed-literal::
+    conda env create
+    conda develop -n devel .
+
+The ``environment.yml`` contains all of the configuration needed to easily
+set up the environment, called ``devel``. The second line sets up conda to
+run directly out of the git repository.
+
 --------------
 Making Changes
 --------------

From eb505974e8d4f5b1693b3f6bd15a352a33a4716e Mon Sep 17 00:00:00 2001
From: Ryan May <rmay31@gmail.com>
Date: Mon, 6 Jul 2015 11:47:16 -0500
Subject: [PATCH 3/3] Update readme with binstar badges.

---
 README.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index dd8912851..1e5065889 100644
--- a/README.rst
+++ b/README.rst
@@ -15,11 +15,19 @@ Siphon
 
 .. image:: https://img.shields.io/pypi/v/siphon.svg
     :target: https://pypi.python.org/pypi/siphon/
-    :alt: Latest Version
+    :alt: PyPI Package
 
 .. image:: https://img.shields.io/pypi/dm/siphon.svg
     :target: https://pypi.python.org/pypi/siphon/
-    :alt: Downloads
+    :alt: PyPI Downloads
+
+.. image:: https://binstar.org/unidata/siphon/badges/version.svg
+    :target: https://binstar.org/unidata/siphon
+    :alt: Binstar Package
+
+.. image:: https://binstar.org/unidata/siphon/badges/downloads.svg
+    :target: https://binstar.org/unidata/siphon
+    :alt: Binstar Downloads
 
 .. image:: https://travis-ci.org/Unidata/siphon.svg?branch=master
     :target: https://travis-ci.org/Unidata/siphon