remove modifying of PATH
correct JAVA_HOME for Mac OS
Merge branch 'master' of github.com:leifg/dotfiles

Conflicts:
	zshrc