fix permissions
don't set JAVA environment variable
latest
Merge branch 'master' of github.com:gjvc/etc

Conflicts:
	pkg/git/dot-gitconfig
	pkg/zsh/completion/default
latest