added vim-jade
Merge remote-tracking branch 'origin/master'

merged w/ previous commit