Modified hadoop/mahout path, javascript plugin

Conflicts:
	.vimrc
	.zshrc