java 1.7
Merge branch 'master' of github.com:witt3rd/dotfiles

Conflicts:
	zsh/zshenv.symlink