better java support
Merge branch 'master' of github.com:hale/dotfiles