java = 6 if no java 7 is installed
Merge branch 'master' of github.com:fmmr/dotfiles