Fix markdown syntax highlighting
Add settings for Java
Add some settings for shell scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	after/ftplugin/sh.vim