use java 7
Merge branch 'master' of github.com:vlc/dot-files