--- a/tool_dependencies.xml	Mon Jul 08 10:20:57 2013 -0400
+++ b/tool_dependencies.xml	Thu Sep 12 07:18:29 2013 -0400
@@ -1,38 +1,45 @@
 <?xml version="1.0"?>
 <tool_dependency>
         <package name="lapack" version="3.4.2">
-            <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="60957bd68fe2" name="package_lapack_3_4" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="atlas" version="3.10.1">
-            <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="3508de0ebae1" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="numpy" version="1.7.1">
-            <repository changeset_revision="ad6ebe2c75ef" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="scipy" version="0.12.0">
             <install version="1.0">
                 <actions>
                     <action type="download_by_url">http://downloads.sourceforge.net/project/scipy/scipy/0.12.0/scipy-0.12.0.tar.gz</action>
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="3508de0ebae1" name="package_atlas_3_10" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="atlas" version="3.10.1" />
                         </repository>
-                        <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="60957bd68fe2" name="package_lapack_3_4" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="lapack" version="3.4.2" />
                         </repository>
-                        <repository changeset_revision="ad6ebe2c75ef" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="numpy" version="1.7.1" />
                         </repository>
                     </action>
+                    <action type="make_directory">$INSTALL_DIR/lib/python</action>
+                    <action language="cheetah" type="template_command">
+                    export PYTHONPATH=\$PYTHONPATH:$env.INSTALL_DIR/lib/python &amp;&amp; 
 
-                    <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                    <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                    export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
-                    export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
-                    export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
-                    export PATH=$PATH:$PATH_NUMPY &amp;&amp; 
-                    export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_NUMPY &amp;&amp; 
-                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                    #if env.get('ATLAS_LIB_DIR', False):
+                        export ATLAS=$env.ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                    #end if
+                    #if env.get('LAPACK_LIB_DIR', False):
+                        export BLAS=$env.LAPACK_LIB_DIR/libblas.a &amp;&amp; 
+                        export LAPACK=$env.LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                    #end if
+
+                    export PATH=\$PATH:$env.PATH_NUMPY &amp;&amp; 
+                    export PYTHONPATH=\$PYTHONPATH:$env.PYTHONPATH_NUMPY &amp;&amp; 
+                    python setup.py install --install-lib $env.INSTALL_DIR/lib/python --install-scripts $env.INSTALL_DIR/bin
+                    </action>
                     <action type="set_environment">
                         <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                         <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>