diff --git a/profile b/profile
index af27f6a..e7c68a0 100644
--- a/profile
+++ b/profile
@@ -40,11 +40,14 @@ export HISTFILESIZE=1000
 export HISTCONTROL=ignoredups
 
 # disable messaging
-mesg n
+if `tty -s`; then
+    mesg n
+fi
 
 # set the path for Hadoop
-export HADOOP_HOME=~/hadoop/hadoop-0.20.2/
-export PATH=$PATH:$HADOOP_HOME/bin
+export HADOOP=~/hadoop
+export PATH=$PATH:$HADOOP/bin
+export JAVA_HOME=/usr
 
 # add the rubygem location
 export PATH=$PATH:/var/lib/gems/1.8/bin/ 
diff --git a/vimrc b/vimrc
index 18f5fce..b54402b 100644
--- a/vimrc
+++ b/vimrc
@@ -27,3 +27,5 @@ autocmd FileType make set noexpandtab
 
 set term=xterm
 
+let java_allow_cpp_keywords = 1
+