merged master in

.bash_local

@@ -1,5 +1,4 @@
 h=`hostname -s`
-ANDROIDPATH=""
 case "$h" in
  vpn*)
  CDATBUILDS="/lgm/uvcdat";;
@@ -26,18 +25,17 @@ case "$h" in
  cab*)
  CDATBUILDS="/usr/gapps/uvcdat/chaos_5_x86_64_ib/default";;
  *Mac*)
- CDATBUILDS="/lgm/uvcdat"
- ANDROIDPATH=${HOME}/Android/adt-bundle-mac-x86_64-20130729/sdk/tools:${HOME}/Android/adt-bundle-mac-x86_64-20130729/sdk/platform-tools;;
+ CDATBUILDS="/lgm/uvcdat";;
  *rhea-lo*)
  CDATBUILDS="/lustre/atlas/world-shared/csc121/uvcdat";;
  sierra*)
  CDATBUILDS="/usr/gapps/uvcdat/chaos_5_x86_64_ib/default"
  ANACONDA_HOME=/usr/gapps/uvcdat/anaconda2;;
  loki*)
- CDATBUILDS="/usr/local/uvcdat"
+ ANACONDA_HOME=${HOME}/miniconda3;;
+ drdoom*)
  ANACONDA_HOME=${HOME}/miniconda3;;
  *)
- CDATBUILDS="/usr/local/uvcdat"
  ANACONDA_HOME=${HOME}/anaconda2;;
 esac
 case `uname` in
@@ -158,7 +156,7 @@ setpy() {
  pth=$1
  fi
  echo "Using "${pth}" conda environment"
- source activate ${pth}
+ conda activate ${pth}
  if [ `uname` == "Darwin" ]; then
  export DYLD_FALLBACK_LIBRARY_PATH=${ANACONDA_HOME}/envs/${pth}/lib
  fi
@@ -253,9 +251,10 @@ unset LD_LIBRARY_PATH
 unset PYTHONPATH
 unset UVCDAT_SETUP_PATH
 
-export PATH=${ANDROIDPATH}:${PATH}:/usr/local/mysql/bin
-export PATH=${ANDROIDPATH}:${PATH}:${HOME}/bin:/usr/local/mysql/bin
 echo "ANACONDA:"${ANACONDA_HOME}
+#export PATH=${ANACONDA_HOME}/bin:$PATH
+source ${ANACONDA_HOME}/etc/profile.d/conda.sh
+conda activate
 
 
 # Stuff I don't want from Gavin's repo

.pythonrc

@@ -1,6 +1,6 @@
 """
 # import rlcompleter
-readline.parse_and_bind("tab: complete")
+#readline.parse_and_bind("tab: complete")
 import sys
 import os
 import vtk
@@ -48,5 +48,4 @@ def Classes(obj, firsttime=True):
  res.add(c)
  res.update(Classes(c, False))
  return res
-
 """