Commenting out unnecessary plugins for vim
Merge branch 'master' of github.com:marsol0x/dotfiles

Conflicts:
	vimrc
Setting JAVA_HOME path to be more platform independent