Add jade and scala indentation defaults
Merge branch 'master' of github.com:homburg/vim

Conflicts:
	ftplugin/jade/jade_indent.vim