Index: build_tools/conda/README.md
===================================================================
--- build_tools/conda/README.md	(revision 981a1d481e8153bde06a09a8003026c8b6dc70fc)
+++ build_tools/conda/README.md	(revision 981a1d481e8153bde06a09a8003026c8b6dc70fc)
@@ -0,0 +1,49 @@
+# Conda Recipes
+
+Here we store the recipes for building conda packages of the dependencies of SasView.  These are dependencies that unforunately do not come pre-bundled with Anaconda.
+
+## Creating a Recipe
+
+An easy way to get started with a recipe is to use the skeleton command that comes with conda, which looks for all the information it needs on PyPi (of course, this will only work if the module exists on PyPi...):
+
+```
+conda skeleton pypi package_name
+```
+
+This automatically chooses the most recent version up on PyPi.  You may specify an older version as follows:
+
+```
+conda skeleton pypi package_name --version 1.0.9
+```
+
+If you run `conda skeleton` from this directory, then the recipes will go into the right place. 
+
+If you're lucky this is all you will need to ever do to create a new recipe, but you may need to go in and tinker with the meta.yaml file from time to time.
+
+## Issues
+
+* Sometimes downloading the package from PyPi is problematic.  You may see something like the following:
+
+  ```
+  Error: Could not open 'C:\\TempAnaconda\\conda-bld\\src_cache\\showfiles.php?group_id=15583.part' for writing ([Errno 22] invalid mode ('wb') or filename: 'C:\\TempAnaconda\\conda-bld\\src_cache\\showfiles.php?group_id=15583.part').
+  ```
+
+  If so, the `source:` values in meta.yaml are pointing to external urls that are not direct links to the downloads (in the case above, a .php link).  Change  `fn:` and `url:` from `http://sourceforge.net/project/showfiles.php?group_id=15583` or similar to an actual link to a .zip of .tar.gz.  Remember to add a correct `mdf:` property so that future users have their downloads checked.
+
+* I once tried to use recipes generated with older versions of conda and ran into problems.  Your options here are either to hack away at the recipe until it works, or just re-generate the recipe with skeleton.
+
+# Building a Conda Package and Uploading to Binstar
+
+```
+conda build bumps\
+```
+
+```
+TEST END: bumps-0.7.5.4-py27_0
+# If you want to upload this package to binstar.org later, type:
+#
+# $ binstar upload C:\TempAnaconda\conda-bld\win-32\bumps-0.7.5.4-py27_0.tar.bz2
+#
+# To have conda build upload to binstar automatically, use
+# $ conda config --set binstar_upload yes
+```
Index: build_tools/conda/appdirs/bld.bat
===================================================================
--- build_tools/conda/appdirs/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/appdirs/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/appdirs/build.sh
===================================================================
--- build_tools/conda/appdirs/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/appdirs/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/appdirs/meta.yaml
===================================================================
--- build_tools/conda/appdirs/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/appdirs/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,60 @@
+package:
+  name: appdirs
+  version: !!str 1.4.0
+
+source:
+  fn: appdirs-1.4.0.tar.gz
+  url: https://pypi.python.org/packages/source/a/appdirs/appdirs-1.4.0.tar.gz
+  md5: 1d17b4c9694ab84794e228f28dc3275b
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - appdirs = appdirs:main
+    #
+    # Would create an entry point called appdirs that calls appdirs.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+
+  run:
+    - python
+
+test:
+  # Python imports
+  imports:
+    - appdirs
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://github.com/ActiveState/appdirs
+  license:  MIT License
+  summary: 'A small Python module for determining appropriate " +         "platform-specific dirs, e.g. a "user data dir".'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/bumps/meta.yaml
===================================================================
--- build_tools/conda/bumps/meta.yaml	(revision f479ac3c505ecbf0d6a8c59aadb7d82853bb035f)
+++ build_tools/conda/bumps/meta.yaml	(revision b75079b1f3e2b82ae67998e5bc86b1f0a3f93147)
@@ -1,26 +1,69 @@
-about: {home: 'http://www.reflectometry.org/danse/software.html', license: UNKNOWN,
-  summary: Data fitting with bayesian uncertainty analysis}
-build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
-package: {name: bumps, version: 0.7.5.3}
+package:
+  name: bumps
+  version: !!str 0.7.5.4
+
+source:
+  fn: bumps-0.7.5.4.tar.gz
+  url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.4.tar.gz
+  md5: a47c035fbb18afa5ca53067506a5ff1c
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - bumps = bumps:main
+    #
+    # Would create an entry point called bumps that calls bumps.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
 requirements:
-  build: [python, setuptools, six]
-  conflicts: []
-  run: [python, six]
-source:
-  fn: bumps-0.7.5.3.tar.gz
-  git_rev: ''
-  md5: f17b41412c3c8ad6432a42e42cb926d5
-  patches: []
-  path: ''
-  svn_rev: ''
-  url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.3.tar.gz
+  build:
+    - python
+    - setuptools
+    - six
+
+  run:
+    - python
+    - six
+
 test:
-  commands: []
-  files: []
-  imports: [bumps, bumps.dream, bumps.gui, bumps.gui.resources, bumps.mystic, bumps.mystic.examples,
-    bumps.mystic.optimizer]
-  requires: []
+  # Python imports
+  imports:
+    - bumps
+    - bumps.dream
+    - bumps.gui
+    - bumps.gui.resources
+    - bumps.mystic
+    - bumps.mystic.examples
+    - bumps.mystic.optimizer
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  requires:
+   - numpy
+   - scipy
+   - matplotlib
+
+about:
+  home: http://www.reflectometry.org/danse/software.html
+  license: UNKNOWN
+  summary: 'Data fitting with bayesian uncertainty analysis'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/mako/bld.bat
===================================================================
--- build_tools/conda/mako/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/mako/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/mako/build.sh
===================================================================
--- build_tools/conda/mako/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/mako/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/mako/meta.yaml
===================================================================
--- build_tools/conda/mako/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/mako/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,66 @@
+package:
+  name: mako
+  version: !!str 1.0.1
+
+source:
+  fn: Mako-1.0.1.tar.gz
+  url: https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz
+  md5: 9f0aafd177b039ef67b90ea350497a54
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+build:
+  #preserve_egg_dir: True
+  entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - mako = mako:main
+    #
+    # Would create an entry point called mako that calls mako.main()
+
+    - mako-render=mako.cmd:cmdline
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - markupsafe >=0.9.2
+
+  run:
+    - python
+    - setuptools
+    - markupsafe >=0.9.2
+
+test:
+  # Python imports
+  imports:
+    - mako
+    - mako.ext
+
+  commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+    - mako-render --help
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://www.makotemplates.org/
+  license: MIT
+  summary: 'A super-fast templating language that borrows the  best ideas from the existing templating languages.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/periodictable/meta.yaml
===================================================================
--- build_tools/conda/periodictable/meta.yaml	(revision f479ac3c505ecbf0d6a8c59aadb7d82853bb035f)
+++ build_tools/conda/periodictable/meta.yaml	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -1,25 +1,64 @@
-about: {home: 'http://www.reflectometry.org/danse/elements.html', license: public
-    domain, summary: Extensible periodic table of the elements}
-build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
-package: {name: periodictable, version: 1.4.1}
-requirements:
-  build: [python, setuptools, pyparsing, numpy]
-  conflicts: []
-  run: [python, pyparsing, numpy]
+package:
+  name: periodictable
+  version: !!str 1.4.1
+
 source:
   fn: periodictable-1.4.1.tar.gz
-  git_rev: ''
+  url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz
   md5: 7246b63cc0b6b1be6e86b6616f9e866e
-  patches: []
-  path: ''
-  svn_rev: ''
-  url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - periodictable = periodictable:main
+    #
+    # Would create an entry point called periodictable that calls periodictable.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - pyparsing
+    - numpy
+
+  run:
+    - python
+    - pyparsing
+    - numpy
+
 test:
-  commands: []
-  files: []
-  imports: [periodictable]
-  requires: []
+  # Python imports
+  imports:
+    - periodictable
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://www.reflectometry.org/danse/elements.html
+  license: public domain
+  summary: 'Extensible periodic table of the elements'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/py2exe/bld.bat
===================================================================
--- build_tools/conda/py2exe/bld.bat	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
+++ build_tools/conda/py2exe/bld.bat	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/py2exe/build.sh
===================================================================
--- build_tools/conda/py2exe/build.sh	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
+++ build_tools/conda/py2exe/build.sh	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/py2exe/meta.yaml
===================================================================
--- build_tools/conda/py2exe/meta.yaml	(revision 929b964868f72a58e2e30f8df7d0856f58111181)
+++ build_tools/conda/py2exe/meta.yaml	(revision 929b964868f72a58e2e30f8df7d0856f58111181)
@@ -0,0 +1,59 @@
+package:
+  name: py2exe
+  version: !!str 0.6.9
+
+source:
+  fn: py2exe-0.6.9.zip
+  url: http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.zip
+  md5: 788df97c3ceb11368c3a938e5acef0b2
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - py2exe = py2exe:main
+    #
+    # Would create an entry point called py2exe that calls py2exe.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+
+  run:
+    - python
+
+test:
+  # Python imports
+  imports:
+    - py2exe
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://www.py2exe.org/
+  license: MIT/X11, MPL 1.1
+  summary: 'Build standalone executables for Windows'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/pyopencl/bld.bat
===================================================================
--- build_tools/conda/pyopencl/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/pyopencl/bld.bat	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/pyopencl/build.sh
===================================================================
--- build_tools/conda/pyopencl/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/pyopencl/build.sh	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/pyopencl/meta.yaml
===================================================================
--- build_tools/conda/pyopencl/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
+++ build_tools/conda/pyopencl/meta.yaml	(revision 20b238dfddfbdd97221dc9a51df8c42be5b54664)
@@ -0,0 +1,72 @@
+package:
+  name: pyopencl
+  version: !!str 2015.1
+
+source:
+  fn: pyopencl-2015.1.tar.gz
+  url: https://pypi.python.org/packages/source/p/pyopencl/pyopencl-2015.1.tar.gz
+  md5: c7b9dd0bb113ad852dae6fdadd417899
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - pyopencl = pyopencl:main
+    #
+    # Would create an entry point called pyopencl that calls pyopencl.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - numpy
+    - pytools >=2014.2
+    - pytest >=2
+    - decorator >=3.2.0
+    - appdirs >=1.4.0
+
+  run:
+    - python
+    - numpy
+    - pytools >=2014.2
+    - pytest >=2
+    - decorator >=3.2.0
+    - appdirs >=1.4.0
+
+test:
+  # Python imports
+  imports:
+    - pyopencl
+    - pyopencl.characterize
+    - pyopencl.compyte
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://mathema.tician.de/software/pyopencl
+  license:  MIT License
+  summary: 'Python wrapper for OpenCL'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/pypdf2/bld.bat
===================================================================
--- build_tools/conda/pypdf2/bld.bat	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
+++ build_tools/conda/pypdf2/bld.bat	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/pypdf2/build.sh
===================================================================
--- build_tools/conda/pypdf2/build.sh	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
+++ build_tools/conda/pypdf2/build.sh	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/pypdf2/meta.yaml
===================================================================
--- build_tools/conda/pypdf2/meta.yaml	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
+++ build_tools/conda/pypdf2/meta.yaml	(revision 6bd3b5dd2340210807e8594b73092c7c02c64010)
@@ -0,0 +1,59 @@
+package:
+  name: pypdf2
+  version: !!str 1.24
+
+source:
+  fn: PyPDF2-1.24.tar.gz
+  url: https://pypi.python.org/packages/source/P/PyPDF2/PyPDF2-1.24.tar.gz
+  md5: 87cbb41c24bd98e6f70a37bb4a97446c
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - pypdf2 = pypdf2:main
+    #
+    # Would create an entry point called pypdf2 that calls pypdf2.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+
+  run:
+    - python
+
+test:
+  # Python imports
+  imports:
+    - PyPDF2
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://mstamy2.github.com/PyPDF2
+  license:  BSD License
+  summary: 'PDF toolkit'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/pytools/bld.bat
===================================================================
--- build_tools/conda/pytools/bld.bat	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
+++ build_tools/conda/pytools/bld.bat	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/pytools/build.sh
===================================================================
--- build_tools/conda/pytools/build.sh	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
+++ build_tools/conda/pytools/build.sh	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/pytools/meta.yaml
===================================================================
--- build_tools/conda/pytools/meta.yaml	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
+++ build_tools/conda/pytools/meta.yaml	(revision 2b31c3c46e78dff488f7d1714841fb36b657a1a6)
@@ -0,0 +1,66 @@
+package:
+  name: pytools
+  version: !!str 2014.3.5
+
+source:
+  fn: pytools-2014.3.5.tar.gz
+  url: https://pypi.python.org/packages/source/p/pytools/pytools-2014.3.5.tar.gz
+  md5: 7f8e9d6a88090a601e96a9ee095d3512
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - pytools = pytools:main
+    #
+    # Would create an entry point called pytools that calls pytools.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - decorator >=3.2.0
+    - appdirs >=1.4.0
+    - six
+
+  run:
+    - python
+    - decorator >=3.2.0
+    - appdirs >=1.4.0
+    - six
+
+test:
+  # Python imports
+  imports:
+    - pytools
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://pypi.python.org/pypi/pytools
+  license:  MIT License
+  summary: 'A collection of tools for Python'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/unittest-xml-reporting/meta.yaml
===================================================================
--- build_tools/conda/unittest-xml-reporting/meta.yaml	(revision f479ac3c505ecbf0d6a8c59aadb7d82853bb035f)
+++ build_tools/conda/unittest-xml-reporting/meta.yaml	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -1,25 +1,64 @@
-about: {home: 'http://github.com/xmlrunner/unittest-xml-reporting/tree/master/', license: BSD
-    License, summary: unittest-based test runner with Ant/JUnit like XML reporting.}
-build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
-package: {name: unittest-xml-reporting, version: 1.10.0}
-requirements:
-  build: [python, setuptools, six >=1.4.0]
-  conflicts: []
-  run: [python, six >=1.4.0]
+package:
+  name: unittest-xml-reporting
+  version: !!str 1.10.0
+
 source:
   fn: unittest-xml-reporting-1.10.0.tar.gz
-  git_rev: ''
+  url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz
   md5: f0d04be2b9bff5b744677b576c326620
-  patches: []
-  path: ''
-  svn_rev: ''
-  url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  #preserve_egg_dir: True
+  #entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - unittest-xml-reporting = unittest-xml-reporting:main
+    #
+    # Would create an entry point called unittest-xml-reporting that calls unittest-xml-reporting.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - six >=1.4.0
+
+  run:
+    - python
+    - six >=1.4.0
+
 test:
-  commands: []
-  files: []
-  imports: [xmlrunner, xmlrunner.extra, xmlrunner.tests]
-  requires: []
+  # Python imports
+  imports:
+    - xmlrunner
+    - xmlrunner.extra
+    - xmlrunner.tests
+
+  #commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://github.com/xmlrunner/unittest-xml-reporting/tree/master/
+  license:  BSD License
+  summary: 'unittest-based test runner with Ant/JUnit like XML reporting.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: build_tools/conda/xhtml2pdf/bld.bat
===================================================================
--- build_tools/conda/xhtml2pdf/bld.bat	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
+++ build_tools/conda/xhtml2pdf/bld.bat	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.
Index: build_tools/conda/xhtml2pdf/build.sh
===================================================================
--- build_tools/conda/xhtml2pdf/build.sh	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
+++ build_tools/conda/xhtml2pdf/build.sh	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.
Index: build_tools/conda/xhtml2pdf/meta.yaml
===================================================================
--- build_tools/conda/xhtml2pdf/meta.yaml	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
+++ build_tools/conda/xhtml2pdf/meta.yaml	(revision 55bde35d88c24806224b9adc5bb57745bd64e998)
@@ -0,0 +1,73 @@
+package:
+  name: xhtml2pdf
+  version: !!str 0.0.6
+
+source:
+  fn: xhtml2pdf-0.0.6.tar.gz
+  url: https://pypi.python.org/packages/source/x/xhtml2pdf/xhtml2pdf-0.0.6.tar.gz
+  md5: dee3703f768efcba26eab81a4207c2c8
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+build:
+  #preserve_egg_dir: True
+  entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - xhtml2pdf = xhtml2pdf:main
+    #
+    # Would create an entry point called xhtml2pdf that calls xhtml2pdf.main()
+
+    - pisa = xhtml2pdf.pisa:command
+    - xhtml2pdf = xhtml2pdf.pisa:command
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - html5lib
+    - pypdf2
+    - pillow
+    - reportlab >=2.2
+
+  run:
+    - python
+    - html5lib
+    - pypdf2
+    - pillow
+    - reportlab >=2.2
+
+test:
+  # Python imports
+  imports:
+    - xhtml2pdf
+    - xhtml2pdf.w3c
+
+  commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+    - pisa --help
+    - xhtml2pdf --help
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://www.xhtml2pdf.com
+  license:  Apache Software License
+  summary: 'PDF generator using HTML and CSS'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
Index: sasview/setup_exe.py
===================================================================
--- sasview/setup_exe.py	(revision 3a39c2e89f90377b2d15fa13b9ba9cf3b4144070)
+++ sasview/setup_exe.py	(revision 4172557c9635687172f37240700561fa30cc6944)
@@ -307,5 +307,5 @@
 #
 packages = [
-    'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes',
+    'matplotlib', 'scipy', 'encodings', 'comtypes',
     'win32com', 'ho.pisa', 'bumps',
     ]
@@ -326,5 +326,5 @@
 
 # Exclude packages that are not needed but are often found on build systems
-excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip']
+excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz']
 
 
Index: src/sas/perspectives/fitting/pagestate.py
===================================================================
--- src/sas/perspectives/fitting/pagestate.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
+++ src/sas/perspectives/fitting/pagestate.py	(revision d06ae30ac5ee253d15e9419032e938ebd5747771)
@@ -472,5 +472,5 @@
         Get the values (strings) from __str__ for report
         """
-        # Dictionary of teh report strings
+        # Dictionary of the report strings
         repo_time = ""
         model_name = ""
@@ -508,6 +508,14 @@
             if name == "value":
                 param_string += value + ','
+	    if name == "selected":
+		if value == u' False':
+		    fixed_parameter = True
+		else:
+		    fixed_parameter = False
             if name == "error value":
-                param_string += value + ','
+	        if fixed_parameter:
+		    param_string += '(fixed),'
+		else:
+                    param_string += value + ','
             if name == "parameter unit":
                 param_string += value + ':'
Index: src/sas/perspectives/fitting/report_dialog.py
===================================================================
--- src/sas/perspectives/fitting/report_dialog.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/report_dialog.py	(revision d06ae30ac5ee253d15e9419032e938ebd5747771)
@@ -1,5 +1,5 @@
 """
 Dialog report panel to show and summarize the results of 
-the invariant calculation.
+the fitting calculation.
 """
 ################################################################################
