vim-markdown
Merge branch 'master' of github.com:krt/dotfiles

Conflicts:
	.vimrc