OS X changes, incl setting JAVA_HOME.

Commenting out the use of MacVim pending a fix for the replace mode
issue, or going to effort to stop using pathogen.