Reverting JAVA_OPTS, and removing un-used vim plugins