detecting java 7
Merge branch 'master' of github.com:narkisr/oh-my-zsh