Use latest java on OSX
Merge branch 'master' of github.com:afbobak/dotfiles

Conflicts:
	.profile