From efe86cdc1017514fd7dabbebda42558798d091ae Mon Sep 17 00:00:00 2001
From: Doreen Reuchsel <doreen.reuchsel@gmail.com>
Date: Thu, 13 Jun 2013 15:56:08 -0400
Subject: [PATCH 1/5] Update .eegfmri_environment

Update FSL to 5.3.0
---
 .env/.eegfmri_environment | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env/.eegfmri_environment b/.env/.eegfmri_environment
index 498821d..d8f2059 100644
--- a/.env/.eegfmri_environment
+++ b/.env/.eegfmri_environment
@@ -3,7 +3,7 @@
 # Source Nipype, FSL, Freesurfer
 source /software/python/setup-nipype-0.7.sh
 source /etc/fsl/5.0/fsl.sh
-source /software/common/bin/fss 5.1.0 > /dev/null
+source /software/common/bin/fss 5.3.0 > /dev/null
 
 # add PATHs
 export PATH=/software/ANTS/versions/120222/bin/:$PATH

From a3e7f9d34e2280542237844f35a391ba8116bcba Mon Sep 17 00:00:00 2001
From: Doreen Reuchsel <doreen.reuchsel@gmail.com>
Date: Fri, 26 Jul 2013 15:43:38 -0400
Subject: [PATCH 2/5] Update .projects

---
 .projects | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.projects b/.projects
index 23d6c2e..e0849d4 100644
--- a/.projects
+++ b/.projects
@@ -19,3 +19,11 @@ function gates_env()
 {
 source ~/.env/.gates_environment
 }
+
+
+function bipsdr_env()
+{
+
+source ~/.env/.bipsdr_environment
+
+}

From 1d98d12772b3ade6aa3f2f8b4f188314f8c9a427 Mon Sep 17 00:00:00 2001
From: Doreen Reuchsel <doreen.reuchsel@gmail.com>
Date: Fri, 26 Jul 2013 15:47:53 -0400
Subject: [PATCH 3/5] Create .bipsdr_environment

---
 .env/.bipsdr_environment | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .env/.bipsdr_environment

diff --git a/.env/.bipsdr_environment b/.env/.bipsdr_environment
new file mode 100644
index 0000000..7e014d9
--- /dev/null
+++ b/.env/.bipsdr_environment
@@ -0,0 +1,3 @@
+project_name="BIPS_"$project_name
+export PYTHONPATH=~doreenr/lib/python2.7/site-packages
+export PATH=~doreenr/BrainImagingPipelines/bin:$PATH

From 3906ecbef309e67ccc8223641e3452d40d3329d6 Mon Sep 17 00:00:00 2001
From: Doreen Reuchsel <doreenr@ba3.mit.edu>
Date: Fri, 16 Aug 2013 14:52:26 -0400
Subject: [PATCH 4/5] Update Env.

---
 .projects | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.projects b/.projects
index 8575dcf..3448295 100644
--- a/.projects
+++ b/.projects
@@ -68,3 +68,13 @@ function CASL_env()
 source ~/.env/.CASL_environment
 
 }
+
+
+
+function bipsdr_env()
+{
+
+source ~/.env/.bipsdr_environment
+
+}
+

From 9d428ce200779f774e0c666c05c4183528a9e3ad Mon Sep 17 00:00:00 2001
From: Doreen Reuchsel <doreen.reuchsel@gmail.com>
Date: Fri, 16 Aug 2013 16:13:55 -0400
Subject: [PATCH 5/5] Update .projects

---
 .projects | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.projects b/.projects
index 1e8d96f..2586e75 100644
--- a/.projects
+++ b/.projects
@@ -72,17 +72,6 @@ source ~/.env/.CASL_environment
 
 <<<<<<< HEAD
 
-=======
->>>>>>> 1d98d12772b3ade6aa3f2f8b4f188314f8c9a427
-
-function bipsdr_env()
-{
-
-source ~/.env/.bipsdr_environment
-
-}
-<<<<<<< HEAD
-
 =======
 function rtsmoking_env()
 {