Index: /issm/trunk-jpl/externalpackages/ipython/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/ipython/install.sh	(revision 17210)
+++ /issm/trunk-jpl/externalpackages/ipython/install.sh	(revision 17211)
@@ -7,8 +7,6 @@
 mkdir src 
 
-if [ ! -f ipython-1.0.0.tar.gz ]; then
-	#Download from ISSM server
-	$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz'
-fi
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz'
 
 #Untar 
Index: /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh	(revision 17210)
+++ /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh	(revision 17211)
@@ -8,8 +8,6 @@
 export FFLAGS=-ff2c
 
-if [ ! -d src ]; then
-	git clone https://github.com/matplotlib/matplotlib
-	mv matplotlib src
-fi
+git clone https://github.com/matplotlib/matplotlib
+mv matplotlib src
 cd src
 python setup.py build 
Index: /issm/trunk-jpl/externalpackages/vim/addons/vimrc
===================================================================
--- /issm/trunk-jpl/externalpackages/vim/addons/vimrc	(revision 17210)
+++ /issm/trunk-jpl/externalpackages/vim/addons/vimrc	(revision 17211)
@@ -100,13 +100,9 @@
 
 " save & "make" the current file in all modes
-map <F6> :w <Enter> :make <Enter><Enter>
-map! <F6>  <ESC> :w <Enter> :make <Enter><Enter>
+map <F8> :w <Enter> :make <Enter><Enter>
+map! <F8>  <ESC> :w <Enter> :make <Enter><Enter>
 " make update: nice for longer documents
-map <F5> :w <Enter> :make update <Enter><Enter>
-map! <F5> <ESC> :w <Enter> :make update <Enter><Enter>
-
-" switch between tabs
-nmap <F7> :tabp <CR>
-nmap <F8> :tabn <CR>
+map <F7> :w <Enter> :make update <Enter><Enter>
+map! <F7> <ESC> :w <Enter> :make update <Enter><Enter>
 
 
@@ -145,13 +141,4 @@
   autocmd BufWritePost   *.sh         !chmod +x %
 
-	" Commenting blocks of code.
-	autocmd FileType c,cpp,java,scala let b:comment_leader = '// '
-	autocmd FileType sh,ruby,python   let b:comment_leader = '# '
-	autocmd FileType conf,fstab       let b:comment_leader = '# '
-	autocmd FileType tex              let b:comment_leader = '% '
-	autocmd FileType mail             let b:comment_leader = '> '
-	autocmd FileType vim              let b:comment_leader = '" '
-	noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
-	noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 endif " has("autocmd")
 " ----------------------------------------------------------------------}}}
Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 17210)
+++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 17211)
@@ -826,5 +826,5 @@
 	int solution_type, i;
 	bool computebasalmeltingrates=true;
-	bool isdrainage=false;
+	bool isdrainage=true;
 	bool updatebasalconstraints=true;