Added JAVA_HOME back
Simplified path
Merge branch 'master' of github.com:NickCody/dotfiles

Conflicts:
	dotbashrc