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

Conflicts:
	vim/ftplugin/java.vim